SCMSourceRetrieverTest: drop separate checkDefaultVersion_inline_allowVersionEnvvar_builtIn() [JENKINS-69731]

Author: jimklimov

src/test/java/org/jenkinsci/plugins/workflow/libs/SCMSourceRetrieverTest.java

@@ -1207,82 +1207,24 @@ public class SCMSourceRetrieverTest {
         r.jenkins.reload();
         r.waitUntilNoActivity();
 
-        WorkflowRun b6 = r.buildAndAssertSuccess(p1);
-        r.assertLogContains("Loading library branchylib@stable", b6);
-        r.assertLogContains("something reliable", b6);
-        r.assertLogContains("Groovy TEST_VAR_NAME missing", b6);
-        r.assertLogContains("env.TEST_VAR_NAME='null'", b6);
-
-        Thread.sleep(160000);
-    }
-
-    @Issue("JENKINS-69731")
-    @Test public void checkDefaultVersion_inline_allowVersionEnvvar_builtIn() throws Exception {
-        // Test that @Library('branchylib@${env.TEST_VAR_NAME}')
-        // is resolved with the TEST_VAR_NAME="feature" in the
-        // "built-in" node environment settings.
-
-        // Do not let caller-provided BRANCH_NAME interfere here
-        assumeFalse("An externally provided TEST_VAR_NAME envvar interferes with tested logic",
-                System.getenv("TEST_VAR_NAME") != null);
-
-        // First apply the "built-in node", then touch Jenkins jobs:
-        Computer builtInComputer = r.jenkins.toComputer();
-        Node builtInNode = builtInComputer.getNode();
-        builtInNode.getNodeProperties().add(new EnvironmentVariablesNodeProperty(new EnvironmentVariablesNodeProperty.Entry("TEST_VAR_NAME", "stable")));
-        r.jenkins.save();
-        builtInNode.save();
-
-        System.out.println("[DEBUG] Restart the 'built-in' Computer connection to clear its cachedEnvironment and recognize added envvar");
-        builtInComputer.setTemporarilyOffline(true, new OfflineCause.ByCLI("Restart built-in to reread envvars config"));
-        builtInComputer.disconnect(new OfflineCause.ByCLI("Restart built-in to reread envvars config"));
-        builtInComputer.waitUntilOffline();
-        r.waitUntilNoActivity();
-        builtInComputer.getChannel().close();
-        Thread.sleep(3000);
-        r.jenkins.reload();
-        builtInComputer.setTemporarilyOffline(false, null);
-        builtInComputer.connect(true);
-        builtInComputer.waitUntilOnline();
-        r.waitUntilNoActivity();
-
         // Feed it to Java reflection, to clear the internal cache...
         Field ccc = Computer.class.getDeclaredField("cachedEnvironment");
         ccc.setAccessible(true);
         ccc.set(builtInComputer, null);
 
-        System.out.println("[DEBUG] builtIn node env: " + builtInComputer.getEnvironment());
-
-        sampleRepo.init();
-        sampleRepo.write("vars/myecho.groovy", "def call() {echo 'something special'}");
-        sampleRepo.git("add", "vars");
-        sampleRepo.git("commit", "--message=init");
-        sampleRepo.git("checkout", "-b", "feature");
-        sampleRepo.write("vars/myecho.groovy", "def call() {echo 'something very special'}");
-        sampleRepo.git("add", "vars");
-        sampleRepo.git("commit", "--message=init");
-        sampleRepo.git("checkout", "-b", "stable");
-        sampleRepo.write("vars/myecho.groovy", "def call() {echo 'something reliable'}");
-        sampleRepo.git("add", "vars");
-        sampleRepo.git("commit", "--message=init");
-        SCMSourceRetriever scm = new SCMSourceRetriever(new GitSCMSource(null, sampleRepo.toString(), "", "*", "", true));
-        LibraryConfiguration lc = new LibraryConfiguration("branchylib", scm);
-        lc.setDefaultVersion("master");
-        lc.setIncludeInChangesets(false);
-        lc.setAllowVersionOverride(true);
-        lc.setAllowVersionEnvvar(true);
-        lc.setTraceDefaultedVersion(true);
-        GlobalLibraries.get().setLibraries(Collections.singletonList(lc));
-
-        WorkflowJob p1 = r.jenkins.createProject(WorkflowJob.class, "p1");
-        p1.setDefinition(new CpsFlowDefinition("@Library('branchylib@${env.TEST_VAR_NAME}') import myecho; myecho(); try { echo \"Groovy TEST_VAR_NAME='${TEST_VAR_NAME}'\"; } catch (groovy.lang.MissingPropertyException mpe) { echo \"Groovy TEST_VAR_NAME missing: ${mpe.getMessage()}\"; } ; echo \"env.TEST_VAR_NAME='${env.TEST_VAR_NAME}'\"", true));
-
+        // Still, "built-in" node's envvars are ignored (technically they -
+        // now that the cache is cleared - reload global config values for
+        // the "MasterComputer" as its own). Checked on standalone instance
+        // configured interactively that even a complete Jenkins restart
+        // does not let configured "built-in" node envvars become recognized.
+        // Loosely related to https://github.com/jenkinsci/jenkins/pull/1728
+        // So we keep this test here as a way to notice if core functionality
+        // ever changes.
         WorkflowRun b6 = r.buildAndAssertSuccess(p1);
         r.assertLogContains("Loading library branchylib@stable", b6);
         r.assertLogContains("something reliable", b6);
         r.assertLogContains("Groovy TEST_VAR_NAME missing", b6);
         r.assertLogContains("env.TEST_VAR_NAME='null'", b6);
-
     }
 
     @Issue("JENKINS-43802")