Switch to using new nfs mount

Signed-off-by: Mesbah Alam <Mesbah_Alam@ca.ibm.com>
adoptium · Feb 13, 2023 · 407a833 · 407a833
1 parent fb2eae0
commit 407a833
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/buildenv/jenkins/openjdk_tests b/buildenv/jenkins/openjdk_tests
@@ -247,8 +247,12 @@ timestamps{
                         timeout(activity: true, time: 1, unit: 'HOURS'){
                             node(params.RELATED_NODES) {
                             echo "On RELATED_NODES: ${params.RELATED_NODES}"
+                            echo "NODE_NAME : ${NODE_NAME}"
+                            env.CLIENT_NODE = "${NODE_NAME}"
                             node(LABEL) {
                                 echo "On main node"
+                                echo "NODE_NAME : ${NODE_NAME}"
+                                env.SERVER_NODE = "${NODE_NAME}"
                                 runTest()
                                 echo "Done with main node"
                                 }

diff --git a/jck/jck.mk b/jck/jck.mk
@@ -108,14 +108,14 @@ endif
 JCK_CMD_TEMPLATE = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)/jck/jtrunner/bin JavaTestRunner resultsRoot=$(REPORTDIR) testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) configAltPath=$(CONFIG_ALT_PATH) $(APPLICATION_OPTIONS)
 
 #TODO: Standardize where RI lives
-REFERENCE_JAVA_CMD=/jck_workdir/ri/jdk-11.0.18/bin/java
-WORKSPACE=/jck_workdir/workspace/output_$(UNIQUEID)/$@
+REFERENCE_JAVA_CMD=/home/jenkins/jckshare/ri/jdk-11.0.19/bin/java
+WORKSPACE=/home/jenkins/jckshare/workspace/output_$(UNIQUEID)/$@
 
 PREP = mkdir -p $(WORKSPACE); cp -rf $(CONFIG_ALT_PATH)$(D)jck$(JCK_VERSION_NUMBER)$(D)compiler.jti $(WORKSPACE)$(D); cp -rf $(TEST_ROOT)$(D)jck$(D)jtrunner $(WORKSPACE)
-GEN_JTB = $(PREP); ssh jenkins@$(RELATED_NODES) '$(REFERENCE_JAVA_CMD) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(WORKSPACE)$(D)jtrunner$(D)bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) testJava=$(JAVA_TO_TEST) riJava=$(REFERENCE_JAVA_CMD) workdir=$(WORKSPACE) configAltPath=$(CONFIG_ALT_PATH) agentHost=$(NODE_NAME) task=cmdfilegen testExecutionType=multijvm
+GEN_JTB = $(PREP); ssh -o StrictHostKeyChecking=no jenkins@$(RELATED_NODES) '$(REFERENCE_JAVA_CMD) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(WORKSPACE)$(D)jtrunner$(D)bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) testJava=$(JAVA_TO_TEST) riJava=$(REFERENCE_JAVA_CMD) workdir=$(WORKSPACE) configAltPath=$(CONFIG_ALT_PATH) agentHost=$(NODE_NAME) task=cmdfilegen testExecutionType=multijvm
 GEN_SUMMARY = $(JAVA_TO_TEST) -Djvm.options=$(Q)$(JVM_OPTIONS)$(Q) -Dother.opts=$(Q)$(OTHER_OPTS)$(Q) -cp $(TEST_ROOT)$(D)jck$(D)jtrunner$(D)bin JavatestUtil testRoot=$(TEST_ROOT) jckRoot=$(JCK_ROOT) jckversion=$(JCK_VERSION) configAltPath=$(CONFIG_ALT_PATH) workdir=$(WORKSPACE) task=summarygen
 START_AGENT = $(JAVA_TO_TEST) -Djavatest.security.allowPropertiesAccess=true -Djava.security.policy=$(JCK_ROOT)$(D)JCK-compiler-$(JCK_VERSION_NUMBER)$(D)lib$(D)jck.policy -classpath $(JCK_ROOT)$(D)JCK-compiler-$(JCK_VERSION_NUMBER)$(D)lib$(D)javatest.jar:$(JCK_ROOT)$(D)JCK-compiler-$(JCK_VERSION_NUMBER)$(D)classes com.sun.javatest.agent.AgentMain -passive -trace &> $(WORKSPACE)$(D)agent.log &
-START_HARNESS = ssh jenkins@$(RELATED_NODES) $(REFERENCE_JAVA_CMD) -jar $(JCK_ROOT)$(D)JCK-runtime-$(JCK_VERSION_NUMBER)$(D)lib$(D)javatest.jar -config $(WORKSPACE)$(D)compiler.jti @$(WORKSPACE)$(D)generated.jtb
+START_HARNESS = ssh -o StrictHostKeyChecking=no jenkins@$(RELATED_NODES) $(REFERENCE_JAVA_CMD) -jar $(JCK_ROOT)$(D)JCK-runtime-$(JCK_VERSION_NUMBER)$(D)lib$(D)javatest.jar -config $(WORKSPACE)$(D)compiler.jti @$(WORKSPACE)$(D)generated.jtb
 
 define START_MULTI_JVM_COMP_TEST
 chmod +x $(TEST_ROOT)$(D)jck$(D)agent-drive.sh; \