commit 6ea3ec4a69d63c60c605d540438bf2ff658f3f97
author Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 28 12:23:59 2019 -0700
committer Carmelo Cascone <carmelo@opennetworking.org> Fri Jun 28 12:29:21 2019 -0700
tree 1359becf65a1f4856d1463be93304ac8b7e921bf
parent 912808dc20e8bc27d2c1dae4b688723bb5d701ff

Use JDK 11 for STC jobs

Change-Id: I620e20fe77d909ac3690cbb55d3dd5682c0bc4ef

tools/test/scenarios/setup.xml

diff --git a/tools/test/scenarios/setup.xml b/tools/test/scenarios/setup.xml
index 41eb65d..10073e0 100644
--- a/tools/test/scenarios/setup.xml
+++ b/tools/test/scenarios/setup.xml
@@ -15,6 +15,8 @@
   -->
 <scenario name="setup" description="ONOS cluster setup">
     <group name="Setup">
+
+        <step name="Set-Jdk-11" exec="stc-set-openjdk11" />
         <step name="Push-Atomix-Bits" exec="atomix-push-bits-through-proxy" if="${OCT}"/>
         <step name="Push-ONOS-Bits" exec="onos-push-bits-through-proxy" if="${OCT}"/>
 
@@ -64,7 +66,7 @@
                 <group name="Parallel-Install-Atomix">
                     <parallel var="${OC#}">
                         <step name="Parallel-Install-Atomix-${#}" exec="atomix-install ${OC#}"
-                              requires="Generate-Cluster-Key,Push-Atomix-Bits-${#},Push-Atomix-Bits,Cleanup"/>
+                              requires="Generate-Cluster-Key,Push-Atomix-Bits-${#},Push-Atomix-Bits,Cleanup,Set-Jdk-11"/>
                     </parallel>
                 </group>
             </group>
@@ -73,7 +75,7 @@
                 <group name="Parallel-Install-Atomix">
                     <parallel var="${OCC#}">
                         <step name="Parallel-Install-Atomix-${#}" exec="atomix-install ${OCC#}"
-                              requires="Generate-Cluster-Key,Push-Atomix-Bits-${#},Push-Atomix-Bits,Cleanup"/>
+                              requires="Generate-Cluster-Key,Push-Atomix-Bits-${#},Push-Atomix-Bits,Cleanup,Set-Jdk-11"/>
                     </parallel>
                 </group>
             </group>
@@ -85,14 +87,14 @@
                             starts="Sequential-Install-${#}"
                             ends="Sequential-Install-${#-1}">
                     <step name="Sequential-Install-${#}" exec="onos-install ${OC#}"
-                          requires="Generate-Cluster-Key,Push-ONOS-Bits-${#},Push-ONOS-Bits,Cleanup,Install-Atomix"/>
+                          requires="Generate-Cluster-Key,Push-ONOS-Bits-${#},Push-ONOS-Bits,Cleanup,Install-Atomix,Set-Jdk-11"/>
                 </sequential>
             </group>
 
             <group name="Parallel-Install-ONOS" unless="${ONOS_STC_SEQ_START}">
                 <parallel var="${OC#}">
                     <step name="Parallel-Install-${#}" exec="onos-install ${OC#}"
-                          requires="Generate-Cluster-Key,Push-ONOS-Bits-${#},Push-ONOS-Bits,Cleanup,Install-Atomix"/>
+                          requires="Generate-Cluster-Key,Push-ONOS-Bits-${#},Push-ONOS-Bits,Cleanup,Install-Atomix,Set-Jdk-11"/>
                 </parallel>
             </group>
         </group>