Skip to content

Commit 52caa06

Browse files
Mesbah-AlamMesbah-Alam
authored
Run sample command on related node (#4193)
Signed-off-by: Mesbah-Alam <[email protected]> Signed-off-by: Mesbah-Alam <[email protected]>
1 parent b7ad64b commit 52caa06

File tree

6 files changed

+3076
-68
lines changed

6 files changed

+3076
-68
lines changed

‎buildenv/jenkins/JenkinsfileBase‎

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -821,7 +821,13 @@ def testExecution() {
821821
} else {
822822
buildTest()
823823
}
824-
runTest()
824+
if( env.BUILD_LIST.startsWith('jck')) {
825+
sshagent(credentials:["${params.JENKINS_KEY}"], ignoreMissing: true) {
826+
runTest()
827+
}
828+
} else {
829+
runTest()
830+
}
825831
} finally {
826832
post("${env.BUILD_LIST}")
827833
}

‎jck/agent-drive.sh‎

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
#!/bin/bash
2+
3+
echo "Starting JCK agent.."
4+
eval $1
5+
6+
pid=$!
7+
8+
echo "Agent started with PID $pid"
9+
10+
echo "Starting JCK harness.."
11+
eval $2
12+
13+
echo "Test complete. Stopping JCK Agent.."
14+
kill -9 $pid

‎jck/compiler.api/playlist.xml‎

Lines changed: 110 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -39,12 +39,7 @@
3939
</groups>
4040
<versions>
4141
<version>8</version>
42-
<version>9</version>
43-
<version>10</version>
4442
<version>11</version>
45-
<version>12</version>
46-
<version>13</version>
47-
<version>14</version>
4843
</versions>
4944
</test>
5045
<test>
@@ -119,4 +114,114 @@
119114
<group>jck</group>
120115
</groups>
121116
</test>
117+
<test>
118+
<testCaseName>jck-compiler-api-java_rmi_multijvm</testCaseName>
119+
<disables>
120+
<disable>
121+
<comment>Disabled on all platforms and Java levels due to backlog/issues/559. To be run manually by CR team</comment>
122+
<impl>ibm</impl>
123+
</disable>
124+
<disable>
125+
<comment>Disabled on all platforms and Java levels due to backlog/issues/559. To be run manually by CR team</comment>
126+
<impl>openj9</impl>
127+
</disable>
128+
</disables>
129+
<variations>
130+
<variation>NoOptions</variation>
131+
</variations>
132+
<command>$(GEN_JTB) tests=api/java_rmi testsuite=COMPILER'; \
133+
$(START_MULTI_JVM_COMP_TEST); \
134+
$(GEN_SUMMARY) tests=api/java_rmi testsuite=COMPILER; \
135+
$(TEST_STATUS)</command>
136+
<levels>
137+
<level>dev</level>
138+
</levels>
139+
<groups>
140+
<group>jck</group>
141+
</groups>
142+
<versions>
143+
<version>8</version>
144+
<version>11</version>
145+
</versions>
146+
</test>
147+
<test>
148+
<testCaseName>jck-compiler-api-javax_annotation_multijvm</testCaseName>
149+
<variations>
150+
<variation>NoOptions</variation>
151+
</variations>
152+
<command>$(GEN_JTB) tests=api/javax_annotation testsuite=COMPILER'; \
153+
$(START_MULTI_JVM_COMP_TEST); \
154+
$(GEN_SUMMARY) tests=api/javax_annotation testsuite=COMPILER; \
155+
$(TEST_STATUS)</command>
156+
<levels>
157+
<level>dev</level>
158+
</levels>
159+
<groups>
160+
<group>jck</group>
161+
</groups>
162+
</test>
163+
<test>
164+
<testCaseName>jck-compiler-api-javax_lang_multijvm</testCaseName>
165+
<variations>
166+
<variation>NoOptions</variation>
167+
</variations>
168+
<command>$(GEN_JTB) tests=api/javax_lang testsuite=COMPILER'; \
169+
$(START_MULTI_JVM_COMP_TEST); \
170+
$(GEN_SUMMARY) tests=api/javax_lang testsuite=COMPILER; \
171+
$(TEST_STATUS)</command>
172+
<levels>
173+
<level>dev</level>
174+
</levels>
175+
<groups>
176+
<group>jck</group>
177+
</groups>
178+
</test>
179+
<test>
180+
<testCaseName>jck-compiler-api-javax_tools_multijvm</testCaseName>
181+
<disables>
182+
<disable>
183+
<comment>Temporarily disabled on z/OS for backlog/issues/669</comment>
184+
<platform>.*zos.*</platform>
185+
<impl>ibm</impl>
186+
<version>11</version>
187+
</disable>
188+
</disables>
189+
<variations>
190+
<variation>NoOptions</variation>
191+
</variations>
192+
<command>$(GEN_JTB) tests=api/javax_tools testsuite=COMPILER'; \
193+
$(START_MULTI_JVM_COMP_TEST); \
194+
$(GEN_SUMMARY) tests=api/javax_tools testsuite=COMPILER; \
195+
$(TEST_STATUS)</command>
196+
<levels>
197+
<level>dev</level>
198+
</levels>
199+
<groups>
200+
<group>jck</group>
201+
</groups>
202+
</test>
203+
<test>
204+
<testCaseName>jck-compiler-api-signaturetest_multijvm</testCaseName>
205+
<disables>
206+
<disable>
207+
<comment>Temporarily disabled on aix on JDK8 for test setup issue: backlog/issues/506</comment>
208+
<platform>ppc64_aix</platform>
209+
<version>8</version>
210+
<impl>openj9</impl>
211+
</disable>
212+
</disables>
213+
<variations>
214+
<variation>NoOptions</variation>
215+
</variations>
216+
<command>$(GEN_JTB) tests=api/signaturetest testsuite=COMPILER'; \
217+
$(START_MULTI_JVM_COMP_TEST); \
218+
$(GEN_SUMMARY) tests=api/signaturetest testsuite=COMPILER; \
219+
$(TEST_STATUS)</command>
220+
<levels>
221+
<level>dev</level>
222+
</levels>
223+
<groups>
224+
<group>jck</group>
225+
</groups>
226+
</test>
122227
</playlist>

0 commit comments

Comments
 (0)