Functest jobs are not showing up

Remove and then re-add to see if we can get jjb merge to work

Change-Id: Iff380b38bbc5a69e2850cd91a99267b6d5b1128f
Signed-off-by: agardner <agardner@linuxfoundation.org>

diff --git a/jjb/apex/apex.yml b/jjb/apex/apex.yml
index 1113b4b..76f4bae 100644 (file)
--- a/jjb/apex/apex.yml
+++ b/jjb/apex/apex.yml
@@ -288,7 +288,6 @@
           block-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
-            - 'functest.*'
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
@@ -372,23 +371,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-      - multijob:
-          name: functest-smoke
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-apex-virtual-suite-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                FUNCTEST_SUITE_NAME=healthcheck
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
+#      - multijob:
+#          name: functest-smoke
+#          condition: SUCCESSFUL
+#          projects:
+#            - name: 'functest-apex-virtual-suite-{stream}'
+#              current-parameters: false
+#              predefined-parameters: |
+#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+#                FUNCTEST_SUITE_NAME=healthcheck
+#                GERRIT_BRANCH=$GERRIT_BRANCH
+#                GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#              node-parameters: true
+#              kill-phase-on: NEVER
+#              abort-all-job: true
+#              git-revision: false
 
 # Baremetal Deploy and Test
 - job-template:
@@ -505,18 +504,18 @@
     builders:
       - description-setter:
           description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - multijob:
-          name: Functest
-          condition: ALWAYS
-          projects:
-            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
-              node-parameters: true
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: NEVER
-              abort-all-job: false
-              git-revision: false
+#      - multijob:
+#          name: Functest
+#          condition: ALWAYS
+#          projects:
+#            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
+#              node-parameters: true
+#              current-parameters: false
+#              predefined-parameters:
+#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+#              kill-phase-on: NEVER
+#              abort-all-job: false
+#              git-revision: false
       - multijob:
           name: Yardstick
           condition: ALWAYS
@@ -735,23 +734,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: false
-      - multijob:
-          name: functest-smoke
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-apex-virtual-suite-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
-                FUNCTEST_SUITE_NAME=tempest_smoke_serial
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: false
+#      - multijob:
+#          name: functest-smoke
+#          condition: SUCCESSFUL
+#          projects:
+#            - name: 'functest-apex-virtual-suite-{stream}'
+#              current-parameters: false
+#              predefined-parameters: |
+#                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+#                FUNCTEST_SUITE_NAME=tempest_smoke_serial
+#                GERRIT_BRANCH=$GERRIT_BRANCH
+#                GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#              node-parameters: true
+#              kill-phase-on: FAILURE
+#              abort-all-job: true
+#              git-revision: false
       - multijob:
           name: create snapshot
           condition: SUCCESSFUL

diff --git a/jjb/apex/apex.yml.j2 b/jjb/apex/apex.yml.j2
index 3ee91ba..5141ead 100644 (file)
--- a/jjb/apex/apex.yml.j2
+++ b/jjb/apex/apex.yml.j2
@@ -166,7 +166,6 @@
           block-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
-            - 'functest.*'
             - 'yardstick.*'
             - 'dovetail.*'
             - 'storperf.*'
@@ -250,23 +249,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-      - multijob:
-          name: functest-smoke
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-apex-virtual-suite-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                FUNCTEST_SUITE_NAME=healthcheck
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
+#      - multijob:
+#          name: functest-smoke
+#          condition: SUCCESSFUL
+#          projects:
+#            - name: 'functest-apex-virtual-suite-{stream}'
+#              current-parameters: false
+#              predefined-parameters: |
+#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+#                FUNCTEST_SUITE_NAME=healthcheck
+#                GERRIT_BRANCH=$GERRIT_BRANCH
+#                GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#              node-parameters: true
+#              kill-phase-on: NEVER
+#              abort-all-job: true
+#              git-revision: false
 
 # Baremetal Deploy and Test
 - job-template:
@@ -383,18 +382,18 @@
     builders:
       - description-setter:
           description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - multijob:
-          name: Functest
-          condition: ALWAYS
-          projects:
-            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
-              node-parameters: true
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: NEVER
-              abort-all-job: false
-              git-revision: false
+#      - multijob:
+#          name: Functest
+#          condition: ALWAYS
+#          projects:
+#            - name: 'functest-apex-baremetal-daily-{scenario_stream}'
+#              node-parameters: true
+#              current-parameters: false
+#              predefined-parameters:
+#                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+#              kill-phase-on: NEVER
+#              abort-all-job: false
+#              git-revision: false
       - multijob:
           name: Yardstick
           condition: ALWAYS
@@ -613,23 +612,23 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: false
-      - multijob:
-          name: functest-smoke
-          condition: SUCCESSFUL
-          projects:
-            - name: 'functest-apex-virtual-suite-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
-                FUNCTEST_SUITE_NAME=tempest_smoke_serial
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              node-parameters: true
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: false
+#      - multijob:
+#          name: functest-smoke
+#          condition: SUCCESSFUL
+#          projects:
+#            - name: 'functest-apex-virtual-suite-{stream}'
+#              current-parameters: false
+#              predefined-parameters: |
+#                DEPLOY_SCENARIO=os-odl_l3-nofeature-noha
+#                FUNCTEST_SUITE_NAME=tempest_smoke_serial
+#                GERRIT_BRANCH=$GERRIT_BRANCH
+#                GERRIT_REFSPEC=$GERRIT_REFSPEC
+#                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
+#                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
+#              node-parameters: true
+#              kill-phase-on: FAILURE
+#              abort-all-job: true
+#              git-revision: false
       - multijob:
           name: create snapshot
           condition: SUCCESSFUL