X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fapex%2Fapex.yaml.j2;h=b2deb731399a172746d2704576a7fc2d2238185b;hb=34d72eb1a6e276473953099359605cc555a7bcf7;hp=33373d6652cfd723aa8969969c250563edc9fa4e;hpb=f5f72d36b3b8892b11cb3a27686a4474100dc0ed;p=releng.git

diff --git a/jjb/apex/apex.yaml.j2 b/jjb/apex/apex.yaml.j2
index 33373d665..b2deb7313 100644
--- a/jjb/apex/apex.yaml.j2
+++ b/jjb/apex/apex.yaml.j2
@@ -39,7 +39,7 @@
           verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'gambia'
           disable_daily: false
-          disable_promote: true
+          disable_promote: false
       - fraser: &fraser
           branch: 'stable/fraser'
           gs-pathname: '/fraser'
@@ -85,18 +85,15 @@
       - 'virtual'
 
     os_version:
-      - 'pike':
-          os_scenario: 'pike'
-          odl_branch: 'stable/carbon'
       - 'queens':
-          os_scenario: 'queens'
+          os_scenario: 'nofeature'
           odl_branch: 'stable/oxygen'
       - 'rocky':
           os_scenario: 'rocky'
-          odl_branch: 'stable/fluorine'
+          odl_branch: 'stable/oxygen'
       - 'master':
           os_scenario: 'nofeature'
-          odl_branch: 'stable/oxygen'
+          odl_branch: 'stable/fluorine'
 
     topology:
       - 'noha'
@@ -156,7 +153,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: false
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
       - throttle:
@@ -233,7 +230,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-deploy.*'
             - 'functest.*'
@@ -289,13 +286,14 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-runner.*'
             - 'apex-run.*'
             - 'apex-virtual-.*'
             - 'apex-verify-gate-.*'
             - 'odl-netvirt.*'
+            - 'apex-.*-promote.*'
       - throttle:
           max-per-node: 1
           max-total: 10
@@ -323,14 +321,6 @@
               kill-phase-on: FAILURE
               abort-all-job: true
               git-revision: true
-      - shell: |
-          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
-          echo 'REPO=opnfv' > functest_repo
-          else
-          echo 'REPO=ollivier' > functest_repo
-          fi
-      - inject:
-          properties-file: functest_repo
       - multijob:
           name: functest-smoke
           condition: ALWAYS
@@ -341,7 +331,6 @@
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
                 FUNCTEST_MODE=$FUNCTEST_MODE
                 FUNCTEST_SUITE_NAME=$FUNCTEST_SUITE_NAME
-                REPO=$REPO
                 GERRIT_BRANCH=$GERRIT_BRANCH
                 GERRIT_REFSPEC=$GERRIT_REFSPEC
                 GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
@@ -393,7 +382,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -434,22 +423,21 @@
               abort-all-job: true
               git-revision: false
       - shell: |
-          if echo $DEPLOY_SCENARIO | grep queens &> /dev/null; then
-            echo 'REPO=opnfv' > functest_properties
-          else
-            echo 'REPO=ollivier' > functest_properties
-          fi
           features=$(echo $DEPLOY_SCENARIO | sed -r -n 's/os-.+-(.+)-(noha|ha)/\1/p')
-          if [ "$features" == 'queens' ]; then
-            functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-queens-(noha|ha)/\1-nofeature-\2/p')
-          elif [[ "$features" =~ 'queens' ]]; then
-            functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_queens-(noha|ha)/\1-\2-\3/p')
+          if [ "$features" == 'rocky' ]; then
+            functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-rocky-(noha|ha)/\1-nofeature-\2/p')
+            echo "DOCKER_TAG=hunter" > functest_scenario
+          elif [[ "$features" =~ 'rocky' ]]; then
+            functest_scenario=$(echo $DEPLOY_SCENARIO | sed -r -n 's/(os-.+?)-(.+)_rocky-(noha|ha)/\1-\2-\3/p')
+            echo "DOCKER_TAG=hunter" > functest_scenario
           else
             functest_scenario=$DEPLOY_SCENARIO
+            echo "DOCKER_TAG=$([[ ${BRANCH##*/} == "master" ]] && \
+              echo "latest" || echo ${BRANCH##*/})" > functest_scenario
           fi
-          echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_properties
+          echo "DEPLOY_SCENARIO=$functest_scenario" >> functest_scenario
       - inject:
-          properties-file: functest_properties
+          properties-file: functest_scenario
           override-build-parameters: true
       - multijob:
           name: 'OPNFV Test Suite'
@@ -458,8 +446,9 @@
             - name: 'apex-testsuite-{scenario}-baremetal-{scenario_stream}'
               node-parameters: true
               current-parameters: false
-              predefined-parameters:
+              predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
@@ -500,12 +489,16 @@
           name: DEPLOY_SCENARIO
           default: '{scenario}'
           description: "Scenario to deploy with."
+      - string:
+          name: DOCKER_TAG
+          default: ''
+          description: Default docker tag to pass to functest
 
     properties:
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -526,8 +519,9 @@
             - name: 'functest-apex-baremetal-daily-{scenario_stream}'
               node-parameters: true
               current-parameters: false
-              predefined-parameters:
+              predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+                DOCKER_TAG=$DOCKER_TAG
               kill-phase-on: NEVER
               abort-all-job: false
               git-revision: false
@@ -620,7 +614,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-daily.*'
 
@@ -733,7 +727,7 @@
           description: "Used for overriding the PROMOTE"
       - string:
           name: GS_URL
-          default: $GS_BASE{gs-pathname}/{os_version}/{topology}
+          default: 'artifacts.opnfv.org/apex/{os_version}/{topology}'
           description: "User for overriding GS_URL from apex params"
       - string:
           name: OS_VERSION
@@ -743,11 +737,14 @@
           name: ODL_BRANCH
           default: '{odl_branch}'
           description: ODL branch being used
-
+      - string:
+          name: FORCE_PROMOTE
+          default: 'False'
+          description: "Used to force promotion and skip CSIT"
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -760,7 +757,7 @@
           option: 'project'
 
     triggers:
-      - timed: '0 12 * * 0'
+      - '{stream}-{os_version}'
 
     builders:
       - multijob:
@@ -803,6 +800,7 @@
                 SSH_KEY_PATH=/tmp/csit/id_rsa
                 ODL_CONTAINERIZED=true
                 OS_VERSION=$OS_VERSION
+                SKIP_CSIT=$FORCE_PROMOTE
               node-parameters: true
               kill-phase-on: NEVER
               abort-all-job: false
@@ -875,7 +873,7 @@
     properties:
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-deploy.*'
@@ -981,7 +979,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -1050,7 +1048,7 @@
       - logrotate-default
       - build-blocker:
           use-build-blocker: true
-          block-level: 'NODE'
+          blocking-level: 'NODE'
           blocking-jobs:
             - 'apex-verify.*'
             - 'apex-runner.*'
@@ -1208,3 +1206,78 @@
     name: 'apex-danube'
     triggers:
       - timed: '0 3 1 1 7'
+
+- trigger:
+    name: 'master-master'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'master-rocky'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'master-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'gambia-queens'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'fraser-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'fraser-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'fraser-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'euphrates-queens'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-rocky'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'danube-queens'
+    triggers:
+      - timed: ''