[#133] jenkins model tests execution order fix

legion-platform · Sep 12, 2018 · cf7d0ef · cf7d0ef
1 parent fdc8462
commit cf7d0ef
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/deploy/legionPipeline.groovy b/deploy/legionPipeline.groovy
@@ -184,7 +184,7 @@ def runRobotTests(tags="") {
             kops export kubecfg --name $CLUSTER_NAME --state $CLUSTER_STATE_STORE
             PATH=../../.venv/bin:$PATH DISPLAY=:99 \
             PROFILE=$Profile LEGION_VERSION=$LegionVersion \
-            ../../.venv/bin/python3 ../../.venv/bin/pabot --verbose --listener legion_test.process_reporter -v PATH_TO_PROFILES_DIR:$PATH_TO_PROFILES_DIR $robot_tags --processes 4 --outputdir . tests/**/*.robot || true
+            ../../.venv/bin/python3 ../../.venv/bin/pabot --verbose --processes 4 --variable PATH_TO_PROFILES_DIR:$PATH_TO_PROFILES_DIR --listener legion_test.process_reporter $robot_tags --outputdir . tests/**/*.robot || true
 
             echo "Starting python tests"
             cd ../python

diff --git a/tests/robot/tests/2_jenkins_models/2.0_check_jenkins_models.robot b/tests/robot/tests/2_jenkins_models/2.0_check_jenkins_models.robot
@@ -7,7 +7,6 @@ Library             legion_test.robot.Utils
 Library             legion_test.robot.Jenkins
 Suite Setup         Run Keywords
 ...                 Connect to Jenkins endpoint    AND
-...                 Run Jenkins job    PERF TEST Vertical-Scaling   Enclave=${MODEL_TEST_ENCLAVE}    AND
 ...                 Run all test Jenkins jobs for enclave    ${MODEL_TEST_ENCLAVE}
 
 *** Test Cases ***
@@ -22,5 +21,6 @@ Check Vertical Scailing
     [Tags]  jenkins model
     :FOR  ${enclave}    IN    @{ENCLAVES}
     \  Connect to Jenkins endpoint
+        Run Jenkins job    PERF TEST Vertical-Scaling   Enclave=${MODEL_TEST_ENCLAVE}
         Wait Jenkins job                  PERF TEST Vertical-Scaling   600
         Last Jenkins job is successful    PERF TEST Vertical-Scaling