Merge "create Stable Branch Jobs for nfvbench"
authorAric Gardner <agardner@linuxfoundation.org>
Tue, 10 Apr 2018 15:00:21 +0000 (15:00 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Tue, 10 Apr 2018 15:00:21 +0000 (15:00 +0000)
16 files changed:
jjb/apex/apex.yml
jjb/apex/apex.yml.j2
jjb/apex/scenarios.yaml.hidden
jjb/barometer/barometer.yml
jjb/calipso/calipso.yml
jjb/container4nfv/container4nfv-project.yml
jjb/container4nfv/yardstick-arm64.yml
jjb/doctor/doctor.yml
jjb/dovetail/dovetail-ci-jobs.yml
jjb/functest/functest-daily-jobs.yml
jjb/global/slave-params.yml
jjb/releng/opnfv-docker-arm.yml
jjb/releng/opnfv-docker.yml
releases/fraser/container4nfv.yaml
releases/fraser/opnfvdocs.yaml [new file with mode: 0644]
releases/fraser/stor4nfv.yaml

index 80ba50b..2380932 100644 (file)
@@ -37,7 +37,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: true
+          disable_daily: false
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
           <<: *danube
       - 'os-ovn-nofeature-noha':
           <<: *danube
-      - 'os-nosdn-nofeature-noha':
-          <<: *master
-      - 'os-nosdn-nofeature-ha':
-          <<: *master
-      - 'os-odl-nofeature-ha':
-          <<: *master
-      - 'os-odl-nofeature-noha':
-          <<: *master
-      - 'os-odl-bgpvpn-ha':
+      - 'os-odl-master_upstream-noha':
           <<: *master
-      - 'os-odl-bgpvpn-noha':
-          <<: *master
-      - 'os-odl-sriov-noha':
-          <<: *master
-      - 'os-odl-ovs_offload-noha':
-          <<: *master
-      - 'os-ovn-nofeature-noha':
-          <<: *master
-      - 'os-nosdn-fdio-noha':
-          <<: *master
-      - 'os-nosdn-fdio-ha':
-          <<: *master
-      - 'os-nosdn-bar-ha':
-          <<: *master
-      - 'os-nosdn-bar-noha':
-          <<: *master
-      - 'os-nosdn-ovs_dpdk-noha':
-          <<: *master
-      - 'os-nosdn-ovs_dpdk-ha':
-          <<: *master
-      - 'os-odl-ovs_dpdk-noha':
-          <<: *master
-      - 'os-odl-ovs_dpdk-ha':
-          <<: *master
-      - 'os-odl-sfc-noha':
-          <<: *master
-      - 'os-odl-sfc-ha':
-          <<: *master
-      - 'os-nosdn-calipso-noha':
+      - 'os-odl-queens_upstream-noha':
           <<: *master
       - 'os-nosdn-nofeature-noha':
           <<: *euphrates
           name: Baremetal Deploy and Test Phase
           condition: SUCCESSFUL
           projects:
-            - name: 'apex-os-nosdn-nofeature-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-nofeature-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-nofeature-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-bgpvpn-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-bgpvpn-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-sriov-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-ovs_offload-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-ovn-nofeature-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-fdio-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-fdio-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-bar-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-bar-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-ovs_dpdk-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-nosdn-ovs_dpdk-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-ovs_dpdk-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-ovs_dpdk-ha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-sfc-noha-baremetal-master'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-os-odl-sfc-ha-baremetal-master'
+            - name: 'apex-os-odl-master_upstream-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-calipso-noha-baremetal-master'
+            - name: 'apex-os-odl-queens_upstream-noha-baremetal-master'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
index 29a93b4..5965efe 100644 (file)
@@ -37,7 +37,7 @@
           baremetal-slave: 'apex-baremetal-master'
           verify-scenario: 'os-odl-nofeature-ha'
           scenario_stream: 'fraser'
-          disable_daily: true
+          disable_daily: false
           disable_promote: true
       - euphrates: &euphrates
           branch: 'stable/euphrates'
index 58f1c64..bc2be4a 100644 (file)
@@ -1,24 +1,6 @@
 master:
-  - 'os-nosdn-nofeature-noha'
-  - 'os-nosdn-nofeature-ha'
-  - 'os-odl-nofeature-ha'
-  - 'os-odl-nofeature-noha'
-  - 'os-odl-bgpvpn-ha'
-  - 'os-odl-bgpvpn-noha'
-  - 'os-odl-sriov-noha'
-  - 'os-odl-ovs_offload-noha'
-  - 'os-ovn-nofeature-noha'
-  - 'os-nosdn-fdio-noha'
-  - 'os-nosdn-fdio-ha'
-  - 'os-nosdn-bar-ha'
-  - 'os-nosdn-bar-noha'
-  - 'os-nosdn-ovs_dpdk-noha'
-  - 'os-nosdn-ovs_dpdk-ha'
-  - 'os-odl-ovs_dpdk-noha'
-  - 'os-odl-ovs_dpdk-ha'
-  - 'os-odl-sfc-noha'
-  - 'os-odl-sfc-ha'
-  - 'os-nosdn-calipso-noha'
+  - 'os-odl-master_upstream-noha'
+  - 'os-odl-queens_upstream-noha'
 fraser:
   - 'os-nosdn-nofeature-noha'
   - 'os-nosdn-nofeature-ha'
index d296738..a8d314a 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
index 2d9ecef..b855752 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           disabled: false
index 1ab50ae..4bd2a80 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
+      - fraser: &fraser
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - euphrates:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
@@ -36,7 +40,8 @@
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - 'opnfv-build-ubuntu-defaults'
 
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
-          description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW."
+          description: "Used for overriding the GIT URL coming from Global Jenkins\
+            \ configuration in case if the stuff is done on none-LF HW."
       # yamllint enable rule:line-length
       - node:
           name: SLAVE_NAME
index 9b8b271..6ed345e 100644 (file)
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
+    fraser: &fraser
+      stream: fraser
+      branch: '{stream}'
+      gs-pathname: 'stable/{stream}'
+      docker-tag: 'stable'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
index 730c7fc..c3760a7 100644 (file)
         arch: 'aarch64'
 
     jobs:
-      - 'doctor-verify-{stream}'
-      - 'doctor-verify-unit-test-{stream}'
       - 'doctor-verify-{inspector}-{stream}'
       - 'doctor-verify-{installer}-{inspector}-{arch}-{stream}'
 
-- job-template:
-    name: 'doctor-verify-{stream}'
-    disabled: '{obj:disabled}'
-    project-type: 'multijob'
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-    scm:
-      - git-scm-gerrit
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - patchset-created-event:
-                exclude-drafts: 'false'
-                exclude-trivial-rebase: 'false'
-                exclude-no-code-change: 'false'
-            - draft-published-event
-            - comment-added-contains-event:
-                comment-contains-value: 'recheck'
-            - comment-added-contains-event:
-                comment-contains-value: 'reverify'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              file-paths:
-                - compare-type: ANT
-                  pattern: 'doctor_tests/**'
-
-    builders:
-      - shell: |
-         #!/bin/bash
-         # we do nothing here as the main stuff will be done
-         # in phase jobs
-         echo "Triggering phase jobs!"
-      - multijob:
-          name: 'doctor-build-and-unittest'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-verify-unit-test-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              kill-phase-on: FAILURE
-              current-parameters: true
-              git-revision: true
-
-- job-template:
-    name: 'doctor-verify-unit-test-{stream}'
-    disabled: '{obj:disabled}'
-    wrappers:
-      - ssh-agent-wrapper
-      - build-timeout:
-          timeout: 60
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-    scm:
-      - git-scm-gerrit
-    builders:
-      - 'doctor-verify-unit-test-builders-macro'
-    publishers:
-      - 'doctor-verify-unit-test-publishers-macro'
-
 - job-template:
     name: 'doctor-verify-{inspector}-{stream}'
     disabled: '{obj:disabled}'
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
+      - 'doctor-slave-parameter'
     scm:
       - git-scm-gerrit
     triggers:
 # builder macros
 # -------------------------------
 
-- builder:
-    name: 'doctor-verify-unit-test-builders-macro'
-    builders:
-      - shell: "tox -e pep8"
-
 - builder:
     name: 'doctor-verify-installer-inspector-builders-macro'
     builders:
           artifacts: 'functest_results/$FUNCTEST_SUITE_NAME.log'
       - email-jenkins-admins-on-failure
 
-- publisher:
-    name: 'doctor-verify-unit-test-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
-      - archive:
-          artifacts: '.tox/'
-
 
 #####################################
 # trigger macros
index 5e5b6e1..a95617a 100644 (file)
@@ -20,8 +20,8 @@
       dovetail-branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    euphrates: &euphrates
-      stream: euphrates
+    fraser: &fraser
+      stream: fraser
       branch: 'stable/{stream}'
       dovetail-branch: master
       gs-pathname: '/{stream}'
           slave-label: fuel-baremetal
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: fuel-virtual
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
           slave-label: compass-baremetal
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - virtual:
           slave-label: compass-virtual
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #    Installers not using labels
       #            CI PODs
           slave-label: apex-virtual-master
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - baremetal:
           slave-label: apex-baremetal-master
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
           slave-label: armband-baremetal
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - armband-virtual:
           slave-label: armband-virtual
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
           slave-label: zte-pod1
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - zte-pod3:
           slave-label: zte-pod3
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - huawei-pod4:
           slave-label: huawei-pod4
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
       - huawei-pod7:
           slave-label: huawei-pod7
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *euphrates
+          <<: *fraser
 
     # -------------------------------
     testsuite:
index 52e5b37..ae226b6 100644 (file)
           slave-label: '{pod}'
           installer: daisy
           <<: *master
+      - zte-pod9:
+          slave-label: '{pod}'
+          installer: daisy
+          <<: *fraser
     # -------------------------------
     # PODs for verify jobs triggered by each patch upload
     #   - ool-virtual1:
index 5f003bf..ee63578 100644 (file)
 - parameter:
     name: 'doctor-slave-parameter'
     parameters:
-      - node:
-          name: SLAVE_NAME
-          description: 'Slave name on Jenkins'
-          allowed-slaves:
-            - 'doctor-apex-x86_64'
-            - 'doctor-fuel-x86_64'
-            - 'doctor-fuel-aarch64'
-            - 'doctor-joid-x86_64'
-            - 'doctor-daisy-x86_64'
-          default-slaves:
-            - 'doctor-apex-x86_64'
       - string:
           name: GIT_BASE
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
index 9d79ea5..9066b41 100644 (file)
           <<: *storperf-arm-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *euphrates
+          <<: *fraser
           <<: *yardstick-arm-receivers
 
     # yamllint enable rule:key-duplicates
index 855780f..f7e9226 100644 (file)
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *euphrates
+          <<: *fraser
           <<: *other-receivers
       # projects with jobs for danube
       - 'dovetail':
index f117f33..4873937 100644 (file)
@@ -6,4 +6,4 @@ release-model: stable
 branches:
   - name: stable/fraser
     location:
-      container4nfv: I6145b406450b0846999223f1e4e6783eb06bb0a9
+      container4nfv: 84ce45c8bf6e03f0373d9c46e0a8b7e0b3faa605
diff --git a/releases/fraser/opnfvdocs.yaml b/releases/fraser/opnfvdocs.yaml
new file mode 100644 (file)
index 0000000..da4835c
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: opnfvdocs
+project-type: infra
+release-model: stable
+
+branches:
+  - name: stable/fraser
+    location:
+      opnfvdocs: 3e010bda69a391f078e581319eccf8de1c4eccb7
index 4700233..5f4f33a 100644 (file)
@@ -6,4 +6,4 @@ release-model: stable
 branches:
   - name: stable/fraser
     location:
-      stor4nfv: I05dd6f833716e36d173f0b4e7f6a317d41f1a039
+      stor4nfv: fcedde93eb366867ed428d362e2cb8a6b7f28b3c