Merge "Create Stable Branch Jobs for availability"
authorTrevor Bramwell <tbramwell@linuxfoundation.org>
Thu, 27 Jun 2019 03:56:47 +0000 (03:56 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Thu, 27 Jun 2019 03:56:47 +0000 (03:56 +0000)
95 files changed:
global-jjb
jjb/apex/apex-project-jobs.yaml
jjb/apex/apex-verify-jobs.yaml
jjb/apex/apex.yaml
jjb/apex/apex.yaml.j2
jjb/apex/scenarios.yaml.hidden
jjb/armband/armband-ci-jobs.yaml
jjb/auto/auto.yaml
jjb/barometer/barometer-rtd-jobs.yaml
jjb/barometer/barometer.yaml
jjb/ci_gate_security/opnfv-ci-gate-security.yaml
jjb/compass4nfv/compass-ci-jobs.yaml
jjb/dovetail/dovetail-ci-jobs.yaml
jjb/dovetail/dovetail-run.sh
jjb/dpacc/dpacc.yaml [deleted file]
jjb/edgecloud/edgecloud-rtd-jobs.yaml
jjb/fuel/fuel-daily-jobs.yaml
jjb/fuel/fuel-deploy.sh
jjb/fuel/fuel-docker-jobs.yaml
jjb/fuel/fuel-rtd-jobs.yaml
jjb/fuel/fuel-verify-jobs.yaml
jjb/functest/functest-alpine.sh
jjb/functest/functest-daily-jobs.yaml
jjb/functest/functest-docker.yaml
jjb/functest/functest-k8.sh
jjb/functest/functest-kubernetes-docker.yaml
jjb/functest/functest-kubernetes-project-jobs.yaml
jjb/functest/functest-kubernetes.yaml
jjb/functest/functest-project-jobs.yaml
jjb/functest/functest-rtd-jobs.yaml
jjb/functest/functest.yaml
jjb/functest/xtesting-docker.yaml
jjb/functest/xtesting-project-jobs.yaml
jjb/functest/xtesting.yaml
jjb/global/releng-defaults.yaml
jjb/global/slave-params.yaml
jjb/ipv6/ipv6-rtd-jobs.yaml
jjb/joid/joid-daily-jobs.yaml [deleted file]
jjb/joid/joid-deploy.sh [deleted file]
jjb/joid/joid-rtd-jobs.yaml [deleted file]
jjb/joid/joid-verify-jobs.yaml [deleted file]
jjb/multisite/multisite-rtd-jobs.yaml [deleted file]
jjb/netready/netready-gluon-build.sh [deleted file]
jjb/netready/netready-rtd-jobs.yaml [deleted file]
jjb/netready/netready-upload-gluon-packages.sh [deleted file]
jjb/netready/netready.yaml [deleted file]
jjb/nfvbench/nfvbench.yaml
jjb/octopus/octopus-rtd-jobs.yaml [deleted file]
jjb/opnfvdocs/docs-rtd.yaml
jjb/opnfvdocs/opnfvdocs.yaml
jjb/promise/promise-rtd-jobs.yaml [deleted file]
jjb/promise/promise.yaml [deleted file]
jjb/releng/opnfv-docker-arm.yaml
jjb/releng/opnfv-docker.sh
jjb/releng/opnfv-docker.yaml
jjb/releng/releng-info-vote.yaml [new file with mode: 0644]
jjb/releng/releng-release-create-venv.sh
jjb/releng/releng-release-jobs.yaml
jjb/sfc/sfc-project-jobs.yaml
jjb/sfc/sfc-rtd-jobs.yaml
jjb/snaps/snaps-verify-jobs.yaml
jjb/storperf/storperf-daily-jobs.yaml
jjb/storperf/storperf-verify-jobs.yaml
jjb/storperf/storperf.yaml
jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
jjb/vswitchperf/vswitchperf.yaml
jjb/xci/xci-set-scenario.sh
jjb/yardstick/yardstick-daily-jobs.yaml
jjb/yardstick/yardstick-daily.sh
jjb/yardstick/yardstick-get-k8s-conf.sh
jjb/yardstick/yardstick-project-jobs.yaml
jjb/yardstick/yardstick-rtd-jobs.yaml
releases/gambia/functest.yaml
releases/hunter/apex.yaml [new file with mode: 0644]
releases/hunter/barometer.yaml [new file with mode: 0644]
releases/hunter/bottlenecks.yaml [new file with mode: 0644]
releases/hunter/clover.yaml [new file with mode: 0644]
releases/hunter/container4nfv.yaml [new file with mode: 0644]
releases/hunter/cran.yaml [new file with mode: 0644]
releases/hunter/doctor.yaml [new file with mode: 0644]
releases/hunter/edgecloud.yaml [new file with mode: 0644]
releases/hunter/fds.yaml [new file with mode: 0644]
releases/hunter/fuel.yaml [new file with mode: 0644]
releases/hunter/functest.yaml
releases/hunter/ipv6.yaml [new file with mode: 0644]
releases/hunter/opnfvdocs.yaml [new file with mode: 0644]
releases/hunter/samplevnf.yaml [new file with mode: 0644]
releases/hunter/stor4nfv.yaml [new file with mode: 0644]
releases/hunter/storperf.yaml [new file with mode: 0644]
releases/hunter/vswitchperf.yaml [new file with mode: 0644]
releases/hunter/yardstick.yaml [new file with mode: 0644]
releases/iruya/functest.yaml [new file with mode: 0644]
utils/fetch_k8_conf.sh
utils/jenkins-jnlp-connect.sh
utils/push-test-logs.sh

index 1a45fc8..623134d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 1a45fc8ab4c2022ce42400b769aaad302baefd8f
+Subproject commit 623134d6449371e8bc28095e53abc051bbb6b4a2
index 42567ea..c581c59 100644 (file)
@@ -9,6 +9,11 @@
           gs-pathname: ''
           concurrent-builds: 3
           disabled: false
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          concurrent-builds: 3
+          disabled: false
       - gambia: &gambia
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
index 23ce14f..e8115eb 100644 (file)
           gs-pathname: ''
           verify-scenario: 'os-nosdn-nofeature-noha'
           disabled: false
+      - hunter: &hunter
+          branch: '{stream}'
+          gs-pathname: ''
+          verify-scenario: 'os-nosdn-nofeature-noha'
+          disabled: false
       - gambia: &gambia
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
index 85e9b18..012d0bf 100644 (file)
@@ -16,7 +16,6 @@
       - 'apex-create-snapshot'
       - 'apex-fetch-snap-info'
       - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
-      - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
     stream:
           verify-scenario: 'os-nosdn-nofeature-noha'
           scenario_stream: 'master'
           disable_daily: false
-          disable_promote: false
+          disable_promote: true
+      - hunter: &hunter
+          branch: 'stable/hunter'
+          gs-pathname: '/hunter'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-nosdn-nofeature-ha'
+          scenario_stream: 'hunter'
+          disable_daily: false
+          disable_promote: true
       - gambia: &gambia
           branch: 'stable/gambia'
           gs-pathname: '/gambia'
@@ -39,7 +48,7 @@
           verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'gambia'
           disable_daily: true
-          disable_promote: false
+          disable_promote: true
       - fraser: &fraser
           branch: 'stable/fraser'
           gs-pathname: '/fraser'
           disable_promote: true
 
     scenario:
-      - 'os-nosdn-nofeature-ha':
-          <<: *fraser
-      - 'os-odl-bgpvpn-ha':
-          <<: *fraser
-      - 'os-nosdn-nofeature-noha':
-          <<: *gambia
-      - 'os-nosdn-nofeature-ha':
-          <<: *gambia
-      - 'os-nosdn-nofeature-ha-ipv6':
-          <<: *gambia
-      - 'os-odl-nofeature-noha':
-          <<: *gambia
-      - 'os-odl-nofeature-ha':
-          <<: *gambia
-      - 'k8s-nosdn-nofeature-noha':
-          <<: *gambia
-      - 'os-odl-bgpvpn-ha':
-          <<: *gambia
-      - 'os-odl-bgpvpn-noha':
-          <<: *gambia
-      - 'os-odl-sfc-ha':
-          <<: *gambia
-      - 'os-odl-sfc-noha':
-          <<: *gambia
-      - 'os-nosdn-calipso-noha':
-          <<: *gambia
-      - 'os-ovn-nofeature-ha':
-          <<: *gambia
       - 'os-nosdn-nofeature-noha':
           <<: *danube
       - 'os-nosdn-nofeature-ha':
           <<: *master
       - 'os-nosdn-nofeature-ha':
           <<: *master
+      - 'os-nosdn-nofeature-noha':
+          <<: *gambia
+      - 'os-nosdn-nofeature-ha':
+          <<: *gambia
       - 'os-nosdn-nofeature-ha-ipv6':
-          <<: *master
+          <<: *gambia
       - 'os-odl-nofeature-noha':
-          <<: *master
+          <<: *gambia
       - 'os-odl-nofeature-ha':
-          <<: *master
-      - 'os-nosdn-rocky-noha':
-          <<: *master
-      - 'os-nosdn-rocky-ha':
-          <<: *master
-      - 'os-nosdn-rocky-ha-ipv6':
-          <<: *master
-      - 'os-odl-rocky-noha':
-          <<: *master
-      - 'os-odl-rocky-ha':
-          <<: *master
+          <<: *gambia
       - 'k8s-nosdn-nofeature-noha':
-          <<: *master
+          <<: *gambia
       - 'os-odl-bgpvpn-ha':
-          <<: *master
+          <<: *gambia
       - 'os-odl-bgpvpn-noha':
-          <<: *master
-      - 'os-odl-bgpvpn_queens-ha':
-          <<: *master
-      - 'os-odl-bgpvpn_queens-noha':
-          <<: *master
+          <<: *gambia
       - 'os-odl-sfc-ha':
-          <<: *master
+          <<: *gambia
       - 'os-odl-sfc-noha':
-          <<: *master
-      - 'os-odl-sfc_rocky-ha':
-          <<: *master
-      - 'os-odl-sfc_rocky-noha':
-          <<: *master
+          <<: *gambia
       - 'os-nosdn-calipso-noha':
-          <<: *master
-      - 'os-nosdn-calipso_rocky-noha':
-          <<: *master
+          <<: *gambia
       - 'os-ovn-nofeature-ha':
-          <<: *master
-      - 'os-ovn-rocky-ha':
-          <<: *master
+          <<: *gambia
+      - 'os-nosdn-nofeature-ha':
+          <<: *fraser
+      - 'os-odl-bgpvpn-ha':
+          <<: *fraser
+      - 'os-nosdn-nofeature-noha':
+          <<: *hunter
+      - 'os-nosdn-nofeature-ha':
+          <<: *hunter
+      - 'os-ovn-nofeature-ha':
+          <<: *hunter
       - 'os-nosdn-nofeature-noha':
           <<: *euphrates
       - 'os-nosdn-nofeature-ha':
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-proposed_tests
+          name: Dovetail-default-mandatory
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}'
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-default
+          name: Dovetail-default-optional
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}'
               enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
+      - multijob:
+          name: Dovetail-proposed_tests
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+              abort-all-job: false
+              git-revision: false
       - multijob:
           name: StorPerf
           condition: ALWAYS
               abort-all-job: false
               git-revision: false
 
-# Dovetail Danube test job
-- job-template:
-    name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
-
-    project-type: 'multijob'
-
-    node: 'huawei-pod4'
-
-    disabled: false
-
-    parameters:
-      - '{project}-defaults'
-      - project-parameter:
-          project: '{project}'
-          branch: 'stable/danube'
-      - apex-parameter:
-          gs-pathname: '/danube'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-          description: "Scenario to deploy with."
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
-          blocking-jobs:
-            - 'apex-verify.*'
-            - 'apex-runner.*'
-            - 'apex-.*-promote.*'
-            - 'apex-run.*'
-
-    triggers:
-      - timed: ''  # '0 1 * * *'
-
-    builders:
-      - description-setter:
-          description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - multijob:
-          name: 'Baremetal Deploy'
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-deploy-baremetal-danube'
-              node-parameters: true
-              current-parameters: true
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: false
-      - multijob:
-          name: Dovetail
-          condition: ALWAYS
-          projects:
-            - name: 'dovetail-apex-baremetal-proposed_tests-danube'
-              node-parameters: true
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: NEVER
-              abort-all-job: false
-              git-revision: false
 
 ########################
 # parameter macros
 # builder macros
 ########################
 
-# fraser Builder
-- builder:
-    name: apex-builder-fraser
-    builders:
-      - multijob:
-          name: Baremetal Deploy and Test Phase
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
-              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-fraser'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-
-# gambia Builder
-- builder:
-    name: apex-builder-gambia
-    builders:
-      - multijob:
-          name: Baremetal Deploy and Test Phase
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia'
-              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-gambia'
-              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-ipv6-baremetal-gambia'
-              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-gambia'
-              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-gambia'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-            - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia'
-              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-gambia'
-              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-gambia'
-              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-gambia'
-              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-gambia'
-              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-calipso-noha-baremetal-gambia'
-              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-ha-baremetal-gambia'
-              node-parameters: false
-              current-parameters: false
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-              kill-phase-on: NEVER
-              abort-all-job: true
-              git-revision: false
-
 # danube Builder
 - builder:
     name: apex-builder-danube
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-nofeature-ha-ipv6-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-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-nosdn-rocky-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-rocky-ha-baremetal-master'
+
+# gambia Builder
+- builder:
+    name: apex-builder-gambia
+    builders:
+      - multijob:
+          name: Baremetal Deploy and Test Phase
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-rocky-ha-ipv6-baremetal-master'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-rocky-noha-baremetal-master'
+            - name: 'apex-os-nosdn-nofeature-ha-ipv6-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-rocky-ha-baremetal-master'
+            - name: 'apex-os-odl-nofeature-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-master'
+            - name: 'apex-os-odl-nofeature-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-bgpvpn-ha-baremetal-master'
+            - name: 'apex-k8s-nosdn-nofeature-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-bgpvpn-noha-baremetal-master'
+            - name: 'apex-os-odl-bgpvpn-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-bgpvpn_queens-ha-baremetal-master'
+            - name: 'apex-os-odl-bgpvpn-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-bgpvpn_queens-noha-baremetal-master'
+            - name: 'apex-os-odl-sfc-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc-ha-baremetal-master'
+            - name: 'apex-os-odl-sfc-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc-noha-baremetal-master'
+            - name: 'apex-os-nosdn-calipso-noha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc_rocky-ha-baremetal-master'
+            - name: 'apex-os-ovn-nofeature-ha-baremetal-gambia'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-odl-sfc_rocky-noha-baremetal-master'
+
+# fraser Builder
+- builder:
+    name: apex-builder-fraser
+    builders:
+      - multijob:
+          name: Baremetal Deploy and Test Phase
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-fraser'
               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-bgpvpn-ha-baremetal-fraser'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-nosdn-calipso_rocky-noha-baremetal-master'
+
+# hunter Builder
+- builder:
+    name: apex-builder-hunter
+    builders:
+      - multijob:
+          name: Baremetal Deploy and Test Phase
+          condition: SUCCESSFUL
+          projects:
+            - name: 'apex-os-nosdn-nofeature-noha-baremetal-hunter'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-ovn-nofeature-ha-baremetal-master'
+            - name: 'apex-os-nosdn-nofeature-ha-baremetal-hunter'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
               kill-phase-on: NEVER
               abort-all-job: true
               git-revision: false
-            - name: 'apex-os-ovn-rocky-ha-baremetal-master'
+            - name: 'apex-os-ovn-nofeature-ha-baremetal-hunter'
               node-parameters: false
               current-parameters: false
               predefined-parameters: |
     triggers:
       - timed: '0 0 1-31/2 * *'
 
+- trigger:
+    name: 'apex-hunter'
+    triggers:
+      - timed: '0 4 2-30/2 * *'
+
 - trigger:
     name: 'apex-gambia'
     triggers:
     triggers:
       - timed: ''
 
+- trigger:
+    name: 'hunter-csit-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-csit-rocky'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'hunter-csit-queens'
+    triggers:
+      - timed: ''
+
 - trigger:
     name: 'gambia-csit-master'
     triggers:
     triggers:
       - timed: ''
 
+- trigger:
+    name: 'hunter-functest-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-functest-rocky'
+    triggers:
+      - timed: '0 3 * * *'
+
+- trigger:
+    name: 'hunter-functest-queens'
+    triggers:
+      - timed: ''
+
 - trigger:
     name: 'gambia-functest-master'
     triggers:
index aaa166e..90bfb1f 100644 (file)
@@ -16,7 +16,6 @@
       - 'apex-create-snapshot'
       - 'apex-fetch-snap-info'
       - 'apex-flex-daily-os-nosdn-nofeature-ha-{stream}'
-      - 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
     # stream:    branch with - in place of / (eg. stable-arno)
     # branch:    branch (eg. stable/arno)
     stream:
           verify-scenario: 'os-nosdn-nofeature-noha'
           scenario_stream: 'master'
           disable_daily: false
-          disable_promote: false
+          disable_promote: true
+      - hunter: &hunter
+          branch: 'stable/hunter'
+          gs-pathname: '/hunter'
+          build-slave: 'apex-build-master'
+          virtual-slave: 'apex-virtual-master'
+          baremetal-slave: 'apex-baremetal-master'
+          verify-scenario: 'os-nosdn-nofeature-ha'
+          scenario_stream: 'hunter'
+          disable_daily: false
+          disable_promote: true
       - gambia: &gambia
           branch: 'stable/gambia'
           gs-pathname: '/gambia'
@@ -39,7 +48,7 @@
           verify-scenario: 'os-nosdn-nofeature-ha'
           scenario_stream: 'gambia'
           disable_daily: true
-          disable_promote: false
+          disable_promote: true
       - fraser: &fraser
           branch: 'stable/fraser'
           gs-pathname: '/fraser'
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-proposed_tests
+          name: Dovetail-default-mandatory
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-mandatory-{scenario_stream}'
               abort-all-job: false
               git-revision: false
       - multijob:
-          name: Dovetail-default
+          name: Dovetail-default-optional
           condition: ALWAYS
           projects:
             - name: 'dovetail-apex-baremetal-default-optional-{scenario_stream}'
               enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
               abort-all-job: false
               git-revision: false
+      - multijob:
+          name: Dovetail-proposed_tests
+          condition: ALWAYS
+          projects:
+            - name: 'dovetail-apex-baremetal-proposed_tests-optional-{scenario_stream}'
+              node-parameters: true
+              current-parameters: false
+              predefined-parameters:
+                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
+              kill-phase-on: NEVER
+              enable-condition: "def m = '$DEPLOY_SCENARIO' ==~ /os-(nosdn-nofeature|odl-bgpvpn)-ha/"
+              abort-all-job: false
+              git-revision: false
       - multijob:
           name: StorPerf
           condition: ALWAYS
               abort-all-job: false
               git-revision: false
 
-# Dovetail Danube test job
-- job-template:
-    name: 'apex-dovetail-daily-os-nosdn-nofeature-ha-baremetal-danube'
-
-    project-type: 'multijob'
-
-    node: 'huawei-pod4'
-
-    disabled: false
-
-    parameters:
-      - '{project}-defaults'
-      - project-parameter:
-          project: '{project}'
-          branch: 'stable/danube'
-      - apex-parameter:
-          gs-pathname: '/danube'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-nosdn-nofeature-ha'
-          description: "Scenario to deploy with."
-
-    properties:
-      - logrotate-default
-      - build-blocker:
-          use-build-blocker: true
-          blocking-level: 'NODE'
-          blocking-jobs:
-            - 'apex-verify.*'
-            - 'apex-runner.*'
-            - 'apex-.*-promote.*'
-            - 'apex-run.*'
-
-    triggers:
-      - timed: ''  # '0 1 * * *'
-
-    builders:
-      - description-setter:
-          description: "Testing on $NODE_NAME - Scenario: $DEPLOY_SCENARIO"
-      - multijob:
-          name: 'Baremetal Deploy'
-          condition: SUCCESSFUL
-          projects:
-            - name: 'apex-deploy-baremetal-danube'
-              node-parameters: true
-              current-parameters: true
-              predefined-parameters: |
-                OPNFV_CLEAN=yes
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: FAILURE
-              abort-all-job: true
-              git-revision: false
-      - multijob:
-          name: Dovetail
-          condition: ALWAYS
-          projects:
-            - name: 'dovetail-apex-baremetal-proposed_tests-danube'
-              node-parameters: true
-              current-parameters: false
-              predefined-parameters:
-                DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-              kill-phase-on: NEVER
-              abort-all-job: false
-              git-revision: false
 
 ########################
 # parameter macros
     triggers:
       - timed: '0 0 1-31/2 * *'
 
+- trigger:
+    name: 'apex-hunter'
+    triggers:
+      - timed: '0 4 2-30/2 * *'
+
 - trigger:
     name: 'apex-gambia'
     triggers:
     triggers:
       - timed: ''
 
+- trigger:
+    name: 'hunter-csit-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-csit-rocky'
+    triggers:
+      - timed: '0 5 * * *'
+
+- trigger:
+    name: 'hunter-csit-queens'
+    triggers:
+      - timed: ''
+
 - trigger:
     name: 'gambia-csit-master'
     triggers:
     triggers:
       - timed: ''
 
+- trigger:
+    name: 'hunter-functest-master'
+    triggers:
+      - timed: ''
+
+- trigger:
+    name: 'hunter-functest-rocky'
+    triggers:
+      - timed: '0 3 * * *'
+
+- trigger:
+    name: 'hunter-functest-queens'
+    triggers:
+      - timed: ''
+
 - trigger:
     name: 'gambia-functest-master'
     triggers:
index a221699..d9d32b4 100644 (file)
@@ -1,27 +1,10 @@
 master:
   - 'os-nosdn-nofeature-noha'
   - 'os-nosdn-nofeature-ha'
-  - 'os-nosdn-nofeature-ha-ipv6'
-  - 'os-odl-nofeature-noha'
-  - 'os-odl-nofeature-ha'
-  - 'os-nosdn-rocky-noha'
-  - 'os-nosdn-rocky-ha'
-  - 'os-nosdn-rocky-ha-ipv6'
-  - 'os-odl-rocky-noha'
-  - 'os-odl-rocky-ha'
-  - 'k8s-nosdn-nofeature-noha'
-  - 'os-odl-bgpvpn-ha'
-  - 'os-odl-bgpvpn-noha'
-  - 'os-odl-bgpvpn_queens-ha'
-  - 'os-odl-bgpvpn_queens-noha'
-  - 'os-odl-sfc-ha'
-  - 'os-odl-sfc-noha'
-  - 'os-odl-sfc_rocky-ha'
-  - 'os-odl-sfc_rocky-noha'
-  - 'os-nosdn-calipso-noha'
-  - 'os-nosdn-calipso_rocky-noha'
+hunter:
+  - 'os-nosdn-nofeature-noha'
+  - 'os-nosdn-nofeature-ha'
   - 'os-ovn-nofeature-ha'
-  - 'os-ovn-rocky-ha'
 gambia:
   - 'os-nosdn-nofeature-noha'
   - 'os-nosdn-nofeature-ha'
index a100f49..0e99cfb 100644 (file)
@@ -3,6 +3,7 @@
 - project:
     name: 'armband-ci'
     project: 'armband'
+    installer: 'fuel'
 
     # -------------------------------
     # BRANCH ANCHORS
       gs-pathname: ''
       disabled: false
       functest_docker_tag: hunter
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      disabled: false
-      gs-pathname: '/{stream}'
-      functest_docker_tag: '{stream}'
-    gambia: &gambia
-      stream: gambia
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: true
       functest_docker_tag: '{stream}'
     # -------------------------------
-    # DEPLOY TYPE ANCHORS
-    # -------------------------------
-    baremetal: &baremetal
-      installer: 'fuel'
-      deploy-type: 'baremetal'
-      slave-label: 'armband-{deploy-type}'
-    virtual: &virtual
-      installer: 'fuel'
-      deploy-type: 'virtual'
-      slave-label: 'armband-{deploy-type}'
-    # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
     # CI POD's
     # -------------------------------
-    # yamllint disable rule:key-duplicates
     pod:
       # -------------------------------
-      #        fraser
-      # -------------------------------
-      - armband-baremetal:
-          <<: *baremetal
-          <<: *fraser
-      # -------------------------------
-      #        gambia
+      #        hunter
       # -------------------------------
       - armband-baremetal:
-          <<: *baremetal
-          <<: *gambia
-      - armband-virtual:
-          <<: *virtual
-          <<: *gambia
+          deploy-type: 'baremetal'
+          slave-label: 'armband-{deploy-type}'
+          <<: *hunter
       # -------------------------------
       #        master
       # -------------------------------
       - armband-baremetal:
-          <<: *baremetal
+          deploy-type: 'baremetal'
+          slave-label: 'armband-{deploy-type}'
           <<: *master
-      - armband-virtual:
-          <<: *virtual
-          <<: *master
-    # yamllint enable rule:key-duplicates
     # -------------------------------
     #       scenarios
     # -------------------------------
     scenario:
       # HA scenarios
       - 'os-nosdn-nofeature-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-odl-nofeature-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-ovn-nofeature-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-ovs-ha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
 
       # NOHA scenarios
       - 'os-nosdn-nofeature-noha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
       - 'os-nosdn-fdio-noha':
-          auto-trigger-name: '{installer}-{scenario}-{pod}-{stream}-trigger'
-
-    exclude:
-      # Dovetail (and only it) should run against Fraser HA baremetal scenarios
-      - scenario: os-nosdn-nofeature-noha
-        stream: fraser
-      - scenario: os-ovn-nofeature-ha
-        stream: fraser
-      - scenario: os-nosdn-fdio-noha
-        stream: fraser
+          auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-      - '{installer}-{scenario}-{pod}-daily-{stream}'
-      - '{installer}-deploy-{pod}-daily-{stream}'
+      - 'fuel-{scenario}-{pod}-daily-{stream}'
+      - 'fuel-deploy-{pod}-daily-{stream}'
 
 ########################
-# job templates
+# job templates: Armband uses Fuel's job templates, no need to duplicate
 ########################
-- job-template:
-    name: '{installer}-{scenario}-{pod}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{installer}-os-.*?-{pod}-daily-.*'
-            - 'armband-verify-.*'
-          blocking-level: 'NODE'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    triggers:
-      - '{auto-trigger-name}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults':
-          gs-pathname: '{gs-pathname}'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
-
-    builders:
-      - trigger-builds:
-          - project: '{installer}-deploy-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-            same-node: true
-            block: true
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'fraser'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'functest-{installer}-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                    DOCKER_TAG={functest_docker_tag}
-                  same-node: true
-                  block: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'fraser'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'yardstick-{installer}-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
-      # 2.testsuite proposed_tests here is for new test cases planning to add into OVP
-      # 3.run proposed_tests on Monday, Wednesday and Friday against ha scenario
-      # 4.testsuite default here is for the test cases already added into OVP
-      # 5.run default testsuite on Tuesday against ha scenario
-      # 6.not used for release criteria or compliance,
-      #   only to debug the dovetail tool bugs with arm pods
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-{installer}-{pod}-proposed_tests-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-{installer}-{pod}-default-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      # Armband uses Fuel's log collection project job, no need to duplicate
-      - trigger-builds:
-          - project: 'fuel-collect-logs-{deploy-type}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters: |
-              DEPLOY_SCENARIO={scenario}
-              INSTALLER_VERSION={stream}
-            block: true
-            same-node: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-
-- job-template:
-    name: '{installer}-deploy-{pod}-daily-{stream}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - '{installer}-deploy-{pod}-daily-{stream}'
-            - '{installer}-deploy-generic-daily-.*'
-          blocking-level: 'NODE'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults':
-          gs-pathname: '{gs-pathname}'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - testapi-parameter
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl-nofeature-ha'
-      - string:
-          name: PROJECT
-          default: '{project}'
-
-    scm:
-      - git-scm
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    builders:
-      - track-begin-timestamp
-      - shell:
-          !include-raw-escape: ../fuel/fuel-deploy.sh
-
-    publishers:
-      - email:
-          recipients: armband@enea.com
-      - email-jenkins-admins-on-failure
-      - report-provision-result
 
 ########################
 # trigger macros
     triggers:
       - timed: '0 1 * * 3,5'
 # ---------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against gambia branch
+# Enea Armband CI Baremetal Triggers running against hunter branch
 # ---------------------------------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 1'
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 7'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 2'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 4,6'
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-armband-baremetal-hunter-trigger'
     triggers:
       - timed: '10 1 * * 3,5'
-# -------------------------------------------------------------------
-# Enea Armband CI Baremetal Triggers running against fraser branch (for Dovetail)
-# -------------------------------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 13 * * 6,7'
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-baremetal-fraser-trigger'
-    triggers:
-      - timed: '0 13 * * 6'
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-baremetal-fraser-trigger'
-    triggers:
-      - timed: '0 13 * * 7'
-# --------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against master branch
-# --------------------------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-fdio-noha-armband-virtual-master-trigger'
-    triggers:
-      - timed: ''
-# -------------------------------------------------------------------
-# Enea Armband CI Virtual Triggers running against gambia branch
-# -------------------------------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-ovn-nofeature-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-ovs-ha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
-- trigger:
-    name: 'fuel-os-nosdn-fdio-noha-armband-virtual-gambia-trigger'
-    triggers:
-      - timed: ''
index 84bb614..3b47c47 100644 (file)
@@ -43,8 +43,8 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-{stream}-trigger'
 
     jobs:
-      - '{installer}-{scenario}-{pod}-auto-daily-{stream}'
-      - '{installer}-deploy-{pod}-daily-{stream}'
+      - 'fuel-{scenario}-{pod}-auto-daily-{stream}'
+      - 'fuel-deploy-{pod}-daily-{stream}'
       - 'auto-daily-{stream}'
       - 'auto-verify-{stream}'
       - 'auto-merge-{stream}'
@@ -53,7 +53,7 @@
 # job templates
 ########################
 - job-template:
-    name: '{installer}-{scenario}-{pod}-auto-daily-{stream}'
+    name: 'fuel-{scenario}-{pod}-auto-daily-{stream}'
 
     disabled: '{obj:disabled}'
 
@@ -69,7 +69,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - '{installer}-os-.*?-{pod}-auto-daily-.*'
+            - 'fuel-os-.*?-{pod}-auto-daily-.*'
           blocking-level: 'NODE'
 
     wrappers:
@@ -93,7 +93,7 @@
 
     builders:
       - trigger-builds:
-          - project: '{installer}-deploy-{pod}-daily-{stream}'
+          - project: 'fuel-deploy-{pod}-daily-{stream}'
             current-parameters: false
             predefined-parameters: |
               DEPLOY_SCENARIO=os-nosdn-nofeature-ha
index 936d1f2..1156772 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - gambia:
           branch: 'stable/{stream}'
           disabled: false
index 9cb222a..6bc904e 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - gambia: &gambia
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
       - timed: '@midnight'
 
     builders:
-      - shell:
-          !include-raw-escape: ./barometer-build.sh
-      - shell:
-          !include-raw-escape: ./barometer-upload-artifact.sh
+      - shell: !include-raw-escape: ./barometer-build.sh
+      - shell: !include-raw-escape: ./barometer-upload-artifact.sh
 
 ########################
 # parameter macros
index ecdb9a1..af88dd5 100644 (file)
@@ -35,7 +35,6 @@
       - enfv
       - fds
       - fuel
-      - functest
       - ipv6
       - joid
       - kvmfornfv
                 comment-contains-value: 'recheck'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|functest|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready'
+              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|compass4nfv|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon|netready'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'
index 9dc8074..4672102 100644 (file)
       # only run on os-(nosdn|odl_l3)-nofeature-ha scenario
       # run with testsuite default, testarea mandatory, dovetail docker image with latest tag
       # run with testsuite default, testarea optional, dovetail docker image with latest tag
+      # run with testsuite proposed_tests, testarea optional, dovetail docker image with latest tag
       - conditional-step:
           condition-kind: and
           condition-operands:
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: os-(nosdn|odl_l3)-nofeature-ha
-              label: '{scenario}'
-          steps:
-            - trigger-builds:
                 - project: 'dovetail-compass-{pod}-default-optional-{stream}'
                   current-parameters: false
                   predefined-parameters: |
                     build-step-failure-threshold: 'never'
                     failure-threshold: 'never'
                     unstable-threshold: 'FAILURE'
+                - project: 'dovetail-compass-{pod}-proposed_tests-optional-{stream}'
+                  current-parameters: false
+                  predefined-parameters: |
+                    DOCKER_TAG=latest
+                    DEPLOY_SCENARIO={scenario}
+                  block: true
+                  same-node: true
+                  block-thresholds:
+                    build-step-failure-threshold: 'never'
+                    failure-threshold: 'never'
+                    unstable-threshold: 'FAILURE'
       - conditional-step:
           condition-kind: and
           condition-operands:
index abbffb2..d45a2ea 100644 (file)
       gs-pathname: ''
       docker-tag: 'latest'
       disabled: true
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      dovetail-branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-      docker-tag: 'ovp-2.0.0'
-    gambia: &gambia
-      stream: gambia
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       dovetail-branch: 'master'
       gs-pathname: '/{stream}'
           slave-label: fuel-baremetal
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - virtual:
-          slave-label: fuel-virtual
-          SUT: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - baremetal:
-          slave-label: fuel-baremetal
-          SUT: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       - virtual:
           slave-label: fuel-virtual
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
           slave-label: compass-baremetal
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       - virtual:
           slave-label: compass-virtual
           SUT: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - baremetal:
-          slave-label: compass-baremetal
-          SUT: compass
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
-      - virtual:
-          slave-label: compass-virtual
-          SUT: compass
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       # -------------------------------
       #    Installers not using labels
       #            CI PODs
           slave-label: apex-virtual-master
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - baremetal:
-          slave-label: apex-baremetal-master
-          SUT: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - virtual:
-          slave-label: apex-virtual-master
-          SUT: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       - baremetal:
           slave-label: apex-baremetal-master
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
-      - armband-baremetal:
-          slave-label: armband-baremetal
-          SUT: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - armband-virtual:
-          slave-label: armband-virtual
-          SUT: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
-      - zte-pod1:
-          slave-label: zte-pod1
-          SUT: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - zte-pod3:
-          slave-label: zte-pod3
-          SUT: fuel
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - huawei-pod4:
-          slave-label: huawei-pod4
-          SUT: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - huawei-pod7:
-          slave-label: huawei-pod7
-          SUT: compass
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
 
     # -------------------------------
     testsuite:
index 04b11fd..0440c4b 100755 (executable)
@@ -35,6 +35,8 @@ ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
 sshkey=""
 
+TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
+
 check_file_exists() {
     if [[ -f $1 ]]; then
         echo 0
@@ -204,13 +206,13 @@ get_fuel_baremetal_pod_file() {
 
     cat << EOF >${POD}
 nodes:
-- {ip: ${INSTALLER_IP}, name: node0, key_filename: /home/opnfv/userconfig/pre_config/id_rsa,
+- {ip: ${INSTALLER_IP}, name: node0, key_filename: ${DOVETAIL_CONFIG}/id_rsa,
    role: Jumpserver, user: ${ssh_user}}
-- {ip: ${fuel_ctl_ip}, name: node1, key_filename: /home/opnfv/userconfig/pre_config/id_rsa,
+- {ip: ${fuel_ctl_ip}, name: node1, key_filename: ${DOVETAIL_CONFIG}/id_rsa,
    role: controller, user: ${ssh_user}, ipmi_ip: ${ipmiIp}, ipmi_user: ${ipmiUser}, ipmi_password: ${ipmiPass}}
-- {ip: ${fuel_msg_ip}, name: msg01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}}
-- {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}}
-- {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: /home/opnfv/userconfig/pre_config/id_rsa, role: controller, user: ${ssh_user}}
+- {ip: ${fuel_msg_ip}, name: msg01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}}
+- {ip: ${fuel_cmp_ip}, name: cmp01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}}
+- {ip: ${fuel_dbs_ip}, name: dbs01, key_filename: ${DOVETAIL_CONFIG}/id_rsa, role: controller, user: ${ssh_user}}
 EOF
 }
 
@@ -239,7 +241,7 @@ get_pod_file_with_scripts() {
 
     cmd="sudo python ${releng_repo}/utils/create_pod_file.py -t ${INSTALLER_TYPE} \
          -i ${INSTALLER_IP} ${options} -f ${POD} \
-         -s /home/opnfv/userconfig/pre_config/id_rsa"
+         -s ${DOVETAIL_CONFIG}/id_rsa"
     echo "INFO: cmd is ${cmd}"
     ${cmd}
 
@@ -402,7 +404,10 @@ fi
 echo "Dovetail: Pulling image ${DOCKER_REPO}:${DOCKER_TAG}"
 docker pull ${DOCKER_REPO}:$DOCKER_TAG >$redirect
 
-cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} ${docker_volume} ${dovetail_home_volume} \
+cmd="docker run ${opts} -e DOVETAIL_HOME=${DOVETAIL_HOME} -e INSTALLER_TYPE=${INSTALLER_TYPE} \
+     -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} -e NODE_NAME=${NODE_NAME} -e BUILD_TAG=${BUILD_TAG} \
+     -e TEST_DB_URL=${TEST_DB_URL} -e VERSION=${SUT_BRANCH} \
+     ${docker_volume} ${dovetail_home_volume} \
      ${sshkey} ${DOCKER_REPO}:${DOCKER_TAG} /bin/bash"
 echo "Dovetail: running docker run command: ${cmd}"
 ${cmd} >${redirect}
@@ -462,7 +467,7 @@ else
     testarea="--testarea ${TESTAREA}"
 fi
 
-run_cmd="dovetail run ${testsuite} ${testarea} --deploy-scenario ${DEPLOY_SCENARIO} -d -r"
+run_cmd="dovetail run ${testsuite} ${testarea} --deploy-scenario ${DEPLOY_SCENARIO} -d -r --opnfv-ci"
 echo "Container exec command: ${run_cmd}"
 docker exec $container_id ${run_cmd}
 
diff --git a/jjb/dpacc/dpacc.yaml b/jjb/dpacc/dpacc.yaml
deleted file mode 100644 (file)
index a9a0914..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
-    name: dpacc
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'
index a3835f3..41b0137 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - gambia:
           branch: 'stable/{stream}'
           disabled: false
index 982b83e..50c82a9 100644 (file)
       disabled: false
       gs-pathname: ''
       functest_docker_tag: hunter
-    fraser: &fraser
-      stream: fraser
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
       functest_docker_tag: '{stream}'
-    gambia: &gambia
-      stream: gambia
-      branch: 'stable/{stream}'
-      disabled: true
-      gs-pathname: '/{stream}'
-      functest_docker_tag: '{stream}'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
           <<: *master
       - baremetal:
           slave-label: fuel-baremetal
-          <<: *gambia
+          <<: *hunter
       - virtual:
           slave-label: fuel-virtual
-          <<: *gambia
-      - baremetal:
-          slave-label: fuel-baremetal
-          <<: *fraser
+          <<: *hunter
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
       - zte-pod1:
           slave-label: zte-pod1
           <<: *master
+      - itri-pod1:
+          slave-label: itri-pod1
+          <<: *master
     # -------------------------------
     #       scenarios
     # -------------------------------
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-nosdn-fdio-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
-
-    exclude:
-      # Dovetail (and only it) should run against Fraser HA baremetal scenarios
-      - scenario: os-nosdn-nofeature-noha
-        stream: fraser
-      - scenario: os-odl-nofeature-noha
-        stream: fraser
-      - scenario: os-odl-sfc-noha
-        stream: fraser
-      - scenario: os-odl-bgpvpn-noha
-        stream: fraser
-      - scenario: os-odl-ovs-noha
-        stream: fraser
-      - scenario: os-ovn-nofeature-noha
-        stream: fraser
-      - scenario: os-nosdn-ovs-noha
-        stream: fraser
-      - scenario: os-nosdn-fdio-noha
-        stream: fraser
-      - scenario: os-ovn-nofeature-ha
-        stream: fraser
-      - scenario: os-nosdn-fdio-ha
-        stream: fraser
+      - 'k8-calico-nofeature-noha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
 
     jobs:
       - 'fuel-{scenario}-{pod}-daily-{stream}'
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'fuel-os-.*?-{pod}-daily-.*'
+            - 'fuel-(os|k8)-.*?-{pod}-daily-.*'
             - 'fuel-verify-.*'
           blocking-level: 'NODE'
 
               INSTALLER_VERSION={stream}
             same-node: true
             block: true
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'fraser'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'functest-fuel-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                    DOCKER_TAG={functest_docker_tag}
-                  same-node: true
-                  block: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: not
-          condition-operand:
-            condition-kind: regex-match
-            regex: 'fraser'
-            label: '{stream}'
-          steps:
-            - trigger-builds:
-                - project: 'yardstick-fuel-{pod}-daily-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      # 1.here the stream means the SUT stream, dovetail stream is defined in its own job
-      # 2.testsuite default here is for the test cases already added into OVP
-      # 3.run default testsuite mandatory test cases against ha scenario
-      # 4.run default testsuite optional test cases against ha scenario twice one week
-      # 5.not used for release criteria or compliance, only to debug the dovetail tool bugs
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
-      - conditional-step:
-          condition-kind: and
-          condition-operands:
-            - condition-kind: regex-match
-              regex: '.*-ha'
-              label: '{scenario}'
-            - condition-kind: day-of-week
-              day-selector: select-days
-              days:
-                MON: true
-                WED: true
-              use-build-time: true
-          steps:
-            - trigger-builds:
-                - project: 'dovetail-fuel-{pod}-default-optional-{stream}'
-                  current-parameters: false
-                  predefined-parameters: |
-                    DEPLOY_SCENARIO={scenario}
-                    INSTALLER_VERSION={stream}
-                  block: true
-                  same-node: true
-                  block-thresholds:
-                    build-step-failure-threshold: 'never'
-                    failure-threshold: 'never'
-                    unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'functest-fuel-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
+              DOCKER_TAG={functest_docker_tag}
+            same-node: true
+            block: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
+      - trigger-builds:
+          - project: 'yardstick-fuel-{pod}-daily-{stream}'
+            current-parameters: false
+            predefined-parameters: |
+              DEPLOY_SCENARIO={scenario}
+              INSTALLER_VERSION={stream}
+            block: true
+            same-node: true
+            block-thresholds:
+              build-step-failure-threshold: 'never'
+              failure-threshold: 'never'
+              unstable-threshold: 'FAILURE'
       - trigger-builds:
           - project: 'fuel-collect-logs-{pod}-daily-{stream}'
             current-parameters: false
     name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: '5 20 * * 3,5'
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
 # ----------------------------------------------
-# Triggers for job running on fuel-baremetal against gambia branch
+# Triggers for job running on fuel-baremetal against hunter branch
 # ----------------------------------------------
 # HA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: '0 20 * * 1,2,4,6,7'
+      - timed: '0 20 * * 1,4,7'
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: '0 5 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-sfc-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-odl-sfc-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 20 * * 6'
 - trigger:
-    name: 'fuel-os-odl-ovs-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 20 * * 2'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-hunter-trigger'
     triggers:
       - timed: '0 20 * * 3,5'
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-hunter-trigger'
+    triggers:
+      - timed: ''
 # ----------------------------------------------
 # Triggers for job running on fuel-virtual against master branch
 # ----------------------------------------------
 - trigger:
     name: 'fuel-os-odl-sfc-noha-virtual-daily-master-trigger'
     triggers:
-      - timed: '5 4 * * *'
+      - timed: '5 4 * * 1,4'
 - trigger:
     name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger'
     triggers:
-      - timed: '5 6 * * *'
+      - timed: '5 6 * * 2,5'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
     name: 'fuel-os-nosdn-fdio-noha-virtual-daily-master-trigger'
     triggers:
       - timed: ''
-# ----------------------------------------------
-# Triggers for job running on fuel-baremetal against fraser branch (for Dovetail)
-# ----------------------------------------------
-- trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: '5 13 * * 6,7'
-- trigger:
-    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-fraser-trigger'
-    triggers:
-      - timed: '0 13 * * 6'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-fraser-trigger'
+    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-master-trigger'
     triggers:
-      - timed: '0 13 * * 7'
+      - timed: '5 16 * * *'
 # ----------------------------------------------
-# Triggers for job running on fuel-virtual against gambia branch
+# Triggers for job running on fuel-virtual against hunter branch
 # ----------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-odl-nofeature-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-hunter-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-hunter-trigger'
     triggers:
       - timed: '0 13 * * *'
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-odl-nofeature-noha-virtual-daily-hunter-trigger'
     triggers:
       - timed: '0 18 * * *'
 - trigger:
-    name: 'fuel-os-odl-sfc-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-odl-sfc-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: '0 4 * * *'
+      - timed: '0 4 * * 1,4'
 - trigger:
-    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: '0 7 * * *'
+      - timed: '0 7 * * 2,5'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-hunter-trigger'
     triggers:
       - timed: '0 23 * * *'
 - trigger:
-    name: 'fuel-os-odl-ovs-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-odl-ovs-noha-virtual-daily-hunter-trigger'
     triggers:
       - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-hunter-trigger'
     triggers:
       - timed: '0 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-gambia-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-hunter-trigger'
     triggers:
-      - timed: ''
+      - timed: '0 13 * * 6,7'
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-hunter-trigger'
+    triggers:
+      - timed: '5 13 * * 6,7'
 # ----------------------------------------------
 # ZTE POD1 Triggers running against master branch
 # ----------------------------------------------
     name: 'fuel-os-nosdn-fdio-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+# ----------------------------------------------
+# ITRI POD1 Triggers running against master branch
+# ----------------------------------------------
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 1'
+- trigger:
+    name: 'fuel-os-odl-nofeature-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 1'
+- trigger:
+    name: 'fuel-os-ovn-nofeature-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 2'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 2'
+- trigger:
+    name: 'fuel-os-nosdn-fdio-ha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+# NOHA Scenarios
+- trigger:
+    name: 'fuel-os-nosdn-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 3'
+- trigger:
+    name: 'fuel-os-odl-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 3'
+- trigger:
+    name: 'fuel-os-odl-sfc-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 4'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-os-ovn-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 4'
+- trigger:
+    name: 'fuel-os-odl-ovs-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 5'
+- trigger:
+    name: 'fuel-os-nosdn-ovs-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 17 * * 5'
+- trigger:
+    name: 'fuel-os-nosdn-fdio-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
+- trigger:
+    name: 'fuel-k8-calico-nofeature-noha-itri-pod1-daily-master-trigger'
+    triggers:
+      - timed: '0 13 * * 6'
index 418b814..dd89447 100755 (executable)
@@ -19,8 +19,8 @@ LAB_NAME=${NODE_NAME/-*}
 # shellcheck disable=SC2153
 POD_NAME=${NODE_NAME/*-}
 
-# Fuel currently supports arm, enea, ericsson, intel, lf, unh and zte labs
-if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte) ]]; then
+# Fuel currently supports arm, enea, ericsson, intel, lf, unh, zte and itri labs
+if [[ ! "${LAB_NAME}" =~ (arm|enea|ericsson|intel|lf|unh|zte|itri) ]]; then
     echo "Unsupported/unidentified lab ${LAB_NAME}. Cannot continue!"
     exit 1
 fi
index 8694890..5149038 100644 (file)
@@ -12,9 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
-          disabled: true
+          disabled: false
 
     arch_tag:
       - 'amd64':
index 7f42c07..3775be8 100644 (file)
@@ -12,9 +12,9 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
-          disabled: true
+          disabled: false
 
     jobs:
       - '{project-name}-rtd-jobs'
index 4678e4f..a5efd2d 100644 (file)
           gs-pathname: ''
           disabled: false
           functest_docker_tag: hunter
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
-          disabled: true
+          disabled: false
           functest_docker_tag: '{stream}'
     #####################################
     # cluster architectures
@@ -66,7 +66,7 @@
       - build-blocker:
           use-build-blocker: true
           blocking-jobs:
-            - 'fuel-os-.*?-daily-.*'
+            - 'fuel-(os|k8)-.*?-daily-.*'
             - 'fuel-verify-.*'
           blocking-level: 'NODE'
 
index 18fec99..37189f8 100755 (executable)
@@ -105,7 +105,8 @@ test -f ${HOME}/opnfv/functest/custom/params_${DOCKER_TAG} && custom_params=$(ca
 envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} -e INSTALLER_IP=${INSTALLER_IP} \
     -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
     -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE} -e CI_LOOP=${CI_LOOP} \
-    -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL}"
+    -e TEST_DB_URL=${TEST_DB_URL} -e ENERGY_RECORDER_API_URL=${ENERGY_RECORDER_API_URL} \
+    -e DEBUG=true"
 
 ssh_options="-o UserKnownHostsFile=/dev/null -o StrictHostKeyChecking=no"
 
@@ -113,7 +114,7 @@ if [ "${INSTALLER_TYPE}" == 'fuel' ]; then
     COMPUTE_ARCH=$(ssh -l ubuntu ${INSTALLER_IP} -i ${SSH_KEY} ${ssh_options} \
         "sudo salt 'cmp*' grains.get cpuarch --out yaml | awk '{print \$2; exit}'")
     IMAGE_PROPERTIES="hw_disk_bus:scsi,hw_scsi_model:virtio-scsi"
-    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH}"
+    envs="${envs} -e POD_ARCH=${COMPUTE_ARCH} -e BLOCK_MIGRATION=false"
 fi
 
 if [[ ${INSTALLER_TYPE} == 'fuel' && ${DEPLOY_SCENARIO} == 'os-nosdn-nofeature-noha' ]]; then
@@ -156,6 +157,7 @@ apex)
 compute-feature-enabled:
     shelve: false
     vnc_console: true
+    block_migration_for_live_migration: false
 identity-feature-enabled:
     api_v2: false
     api_v2_admin: false
@@ -176,6 +178,7 @@ compass)
 compute-feature-enabled:
     shelve: false
     vnc_console: false
+    block_migration_for_live_migration: false
     spice_console: true
 identity-feature-enabled:
     api_v2: false
@@ -240,12 +243,6 @@ compute:
     max_microversion: 2.65
 EOF
     ;;
-stable/gambia)
-    cat << EOF >> "${tempest_conf_yaml}"
-compute:
-    max_microversion: 2.60
-EOF
-    ;;
 esac
 echo "tempest_conf.yaml:" && cat "${tempest_conf_yaml}"
 
@@ -253,6 +250,36 @@ volumes="${images_vol} ${results_vol} ${sshkey_vol} ${libvirt_vol} \
     ${userconfig_vol} ${rc_file_vol} ${cacert_file_vol} \
     -v ${tempest_conf_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml"
 
+if [[ ${INSTALLER_TYPE} == 'apex' ]]; then
+    blacklist_yaml=$(mktemp)
+    cat << EOF >> "${blacklist_yaml}"
+---
+-
+    scenarios:
+        - os-ovn-nofeature-ha
+    tests:
+        - neutron_tempest_plugin.api.admin.test_agent_management
+        - neutron_tempest_plugin.api.admin.test_dhcp_agent_scheduler
+        - patrole_tempest_plugin.tests.api.network.test_agents_rbac
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_network_type
+        - patrole_tempest_plugin.tests.api.network.test_networks_rbac.NetworksRbacTest.test_create_network_provider_segmentation_id
+        - tempest.api.network.admin.test_agent_management
+        - tempest.api.network.admin.test_dhcp_agent_scheduler
+        - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+-
+    scenarios:
+        - os-nosdn-nofeature-ha
+    tests:
+        - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+-
+    scenarios:
+        - os-nosdn-nofeature-noha
+    tests:
+        - tempest.api.object_storage.test_crossdomain.CrossdomainTest.test_get_crossdomain_policy
+EOF
+    volumes="${volumes} -v ${blacklist_yaml}:/usr/lib/python2.7/site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml"
+fi
+
 ret_val_file="${HOME}/opnfv/functest/results/${BRANCH##*/}/return_value"
 echo 0 > ${ret_val_file}
 
@@ -269,17 +296,9 @@ else
     tests=()
     skip_tests=0
     if [ "${HOST_ARCH}" != "aarch64" ]; then
-        if [[ ${BRANCH} == "stable/gambia" ]]; then
-            tiers=(healthcheck smoke benchmarking features vnf components)
-        else
-            tiers=(healthcheck smoke benchmarking features vnf)
-        fi
+        tiers=(healthcheck smoke benchmarking features vnf)
     else
-        if [[ ${BRANCH} == "stable/gambia" ]]; then
-            tiers=(healthcheck smoke benchmarking features components)
-        else
-            tiers=(healthcheck smoke benchmarking features)
-        fi
+        tiers=(healthcheck smoke benchmarking features)
     fi
     run_tiers ${tiers}
     if [ ${skip_tests} -eq 0 ]; then
index 08c453f..e1f15fd 100644 (file)
@@ -14,8 +14,8 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-    gambia: &gambia
-      stream: gambia
+    iruya: &iruya
+      stream: iruya
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
     hunter: &hunter
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *gambia
+          <<: *hunter
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *gambia
-      # compass CI PODs
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          <<: *gambia
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          <<: *gambia
+          <<: *hunter
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
       - virtual:
           slave-label: apex-virtual-master
           installer: apex
-          <<: *gambia
+          <<: *hunter
       - baremetal:
           slave-label: apex-baremetal-master
           installer: apex
-          <<: *gambia
+          <<: *hunter
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *gambia
+          <<: *hunter
+      # fuel NONE CI PODs
+      - zte-pod1:
+          slave-label: fuel-baremetal
+          installer: fuel
+          <<: *master
+      - itri-pod1:
+          slave-label: fuel-baremetal
+          installer: fuel
+          <<: *master
 
     testsuite:
       - 'suite':
index d831db5..5612960 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -39,6 +39,8 @@
     exclude:
       - stream: 'master'
         image: 'components'
+      - stream: 'iruya'
+        image: 'components'
       - stream: 'hunter'
         image: 'components'
 
           #!/bin/bash -ex
           case "{arch_tag}" in
           "arm64")
-              sudo amd64_dirs= arm64_dirs=docker/{image} bash ./build.sh ;;
+              sudo amd64_dirs= arm64_dirs=docker/{image} arm_dirs= bash ./build.sh ;;
           *)
-              sudo amd64_dirs=docker/{image} arm64_dirs= bash ./build.sh ;;
+              sudo amd64_dirs=docker/{image} arm64_dirs= arm_dirs= bash ./build.sh ;;
           esac
           exit $?
 
index 8561b02..4543f7f 100755 (executable)
@@ -4,48 +4,24 @@ set -e
 set +u
 set +o pipefail
 
-[[ $CI_DEBUG == true ]] && redirect="/dev/stdout" || redirect="/dev/null"
+redirect="/dev/stdout"
 FUNCTEST_DIR=/home/opnfv/functest
 
-rc_file=${HOME}/k8.creds
-sudo rm -rf $rc_file
-
-if [[ ${INSTALLER_TYPE} == 'compass' ]]; then
-    admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
-    echo "export KUBERNETES_PROVIDER=local" >> $rc_file
-    KUBE_MASTER_URL=$(cat ${HOME}/admin.conf|grep server| awk '{print $2}')
-    echo "export KUBE_MASTER_URL=$KUBE_MASTER_URL" >> $rc_file
-    KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL|awk -F'https://|:[0-9]+' '$0=$2')
-    echo "export KUBE_MASTER_IP=$KUBE_MASTER_IP" >> $rc_file
-elif [[ ${INSTALLER_TYPE} == 'joid' && ${BRANCH} == 'master' ]]; then
-    admin_conf_file_vol="-v ${HOME}/joid_config/config:/root/.kube/config"
-    rc_file=${HOME}/joid_config/k8config
-elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
-    admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
-    KUBE_MASTER_URL=$(awk '/server:/ {print $2}' ${HOME}/admin.conf | grep -Fv localhost)
-    KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL | grep -Po '(\d+\.){3}\d+')
-    for k in KUBERNETES_PROVIDER KUBE_MASTER_URL KUBE_MASTER_IP; do
-        echo "export $k=${!k}" >> $rc_file
-    done
-else
-    echo "Not supported by other installers yet"
-    exit 1
-fi
-
-rc_file_vol="-v ${rc_file}:${FUNCTEST_DIR}/conf/env_file"
+admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
+cat ${HOME}/admin.conf
 
 dir_result="${HOME}/opnfv/functest/results/${BRANCH##*/}"
 mkdir -p ${dir_result}
 sudo rm -rf ${dir_result}/*
 results_vol="-v ${dir_result}:${FUNCTEST_DIR}/results"
 
-volumes="${rc_file_vol} ${results_vol} ${admin_conf_file_vol}"
+volumes="${results_vol} ${admin_conf_file_vol}"
 
 envs="-e INSTALLER_TYPE=${INSTALLER_TYPE} \
     -e NODE_NAME=${NODE_NAME} -e DEPLOY_SCENARIO=${DEPLOY_SCENARIO} \
-    -e BUILD_TAG=${BUILD_TAG} -e DEPLOY_TYPE=${DEPLOY_TYPE}"
+    -e BUILD_TAG=${BUILD_TAG}"
 
-DOCKER_TAG=`[[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/}`
+DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})}
 
 set +e
 
index 9a074da..c8c55e7 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
index 6dcd880..178df6a 100644 (file)
     jobs:
       - 'functest-kubernetes-verify-{stream}'
       - 'functest-kubernetes-verify-{phase}-{stream}'
-      - 'functest-kubernetes-docs-upload-{stream}'
 
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - hunter: &hunter
+      - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - gambia: &gambia
+      - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
     phase:
       - 'unit-tests-and-docs':
           slave-label: 'opnfv-build-ubuntu'
-      - 'build-x86_64':
-          slave-label: 'opnfv-build-ubuntu'
-      - 'build-aarch64':
-          slave-label: 'opnfv-build-ubuntu-arm'
 
 - job-template:
     name: 'functest-kubernetes-verify-{stream}'
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: false
-            - name: 'functest-kubernetes-verify-build-x86_64-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                ARCH=x86_64
-              git-revision: true
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: false
-            - name: 'functest-kubernetes-verify-build-aarch64-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                ARCH=aarch64
-              git-revision: true
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: false
 
 - job-template:
     name: 'functest-kubernetes-verify-{phase}-{stream}'
     publishers:
       - 'functest-kubernetes-verify-{phase}-publishers-macro'
 
-- job-template:
-    name: 'functest-kubernetes-docs-upload-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - 'functest-kubernetes-docs-upload-triggers-macro':
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - functest-kubernetes-upload-doc-artifact
-
 ################################
 # job triggers
 ################################
                 - compare-type: ANT
                   pattern: 'docs/**|.gitignore'
 
-- trigger:
-    name: 'functest-kubernetes-docs-upload-triggers-macro'
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**|.gitignore'
 ################################
 # job builders
 ################################
       - shell: |
           cd $WORKSPACE && tox
 
-- builder:
-    name: 'functest-kubernetes-verify-build-x86_64-builders-macro'
-    builders:
-      - shell: |
-          echo "Not activated!"
-
-- builder:
-    name: 'functest-kubernetes-verify-build-aarch64-builders-macro'
-    builders:
-      - shell: |
-          echo "Not activated!"
-
-- builder:
-    name: 'functest-kubernetes-upload-doc-artifact'
-    builders:
-      - shell: |
-          cd $WORKSPACE && tox -edocs
-            wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs"
 ################################
 # job publishers
 ################################
                 unhealthy: 40
                 failing: 30
       - email-jenkins-admins-on-failure
-
-- publisher:
-    name: 'functest-kubernetes-verify-build-x86_64-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
-
-- publisher:
-    name: 'functest-kubernetes-verify-build-aarch64-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
index 3bdb61d..9f8f22d 100644 (file)
     tag:
       - latest:
           branch: master
+          slave: lf-virtual8
+      - iruya:
+          branch: stable/iruya
+          slave: lf-virtual7
       - hunter:
           branch: stable/hunter
+          slave: lf-virtual5
 
 - parameter:
     name: functest-kubernetes-slave
     parameters:
       - label:
           name: slave
-          default: functest-virtual
+          default: '{slave}'
 
 - parameter:
     name: functest-kubernetes-branch
@@ -57,7 +62,7 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker pull $image
+          docker pull $image
 
 - builder:
     name: functest-kubernetes-build-containers
@@ -77,7 +82,7 @@
             build_arg="--build-arg {ref_arg}={ref}"
           fi
           cd {path}
-          sudo docker build $build_arg \
+          docker build $build_arg \
             --pull=false --no-cache --force-rm=true \
             -t $image .
 
@@ -85,8 +90,9 @@
     name: functest-kubernetes-run-containers
     builders:
       - shell: |
-          set +ex
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          set +e
+          set -x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
+          docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
-            -v /home/opnfv/functest-kubernetes/config:/root/.kube/config \
+            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
+            gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID
           find $WORKSPACE -type f \
             -printf \
             "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n"
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker rmi $image || true
+          docker rmi $image || true
 
 - scm:
     name: functest-kubernetes-scm
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     builders:
       - functest-kubernetes-pull-containers:
           <<: *functest-kubernetes-containers
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     builders:
       - functest-kubernetes-remove-images:
           <<: *functest-kubernetes-containers
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     scm:
       - functest-kubernetes-scm:
           ref: $GERRIT_REFSPEC
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-check'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
       - functest-kubernetes-branch:
           branch: '{branch}'
     scm:
     port:
     container: golang
     tag: alpine3.9
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
     port:
     container: golang
     tag: alpine3.9
+    slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
     name: 'functest-kubernetes-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
       - functest-kubernetes-branch:
           branch: '{branch}'
     properties:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
       - functest-kubernetes-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-kubernetes-slave
+      - functest-kubernetes-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-kubernetes-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
index 35a18cf..69df265 100644 (file)
     jobs:
       - 'functest-verify-{stream}'
       - 'functest-verify-{phase}-{stream}'
-      - 'functest-docs-upload-{stream}'
 
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           gs-pathname: ''
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           gs-pathname: ''
           disabled: false
     phase:
       - 'unit-tests-and-docs':
           slave-label: 'opnfv-build-ubuntu'
-      - 'build-x86_64':
-          slave-label: 'opnfv-build-ubuntu'
-      - 'build-aarch64':
-          slave-label: 'opnfv-build-ubuntu-arm'
 
 - job-template:
     name: 'functest-verify-{stream}'
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: false
-            - name: 'functest-verify-build-x86_64-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                ARCH=x86_64
-              git-revision: true
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: false
-            - name: 'functest-verify-build-aarch64-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                ARCH=aarch64
-              git-revision: true
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: false
 
 - job-template:
     name: 'functest-verify-{phase}-{stream}'
     publishers:
       - 'functest-verify-{phase}-publishers-macro'
 
-- job-template:
-    name: 'functest-docs-upload-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - 'functest-docs-upload-triggers-macro':
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - functest-upload-doc-artifact
-
 ################################
 # job triggers
 ################################
                 - compare-type: ANT
                   pattern: 'docs/**|.gitignore'
 
-- trigger:
-    name: 'functest-docs-upload-triggers-macro'
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**|.gitignore'
 ################################
 # job builders
 ################################
       - shell: |
           cd $WORKSPACE && tox
 
-- builder:
-    name: 'functest-verify-build-x86_64-builders-macro'
-    builders:
-      - shell: |
-          echo "Not activated!"
-
-- builder:
-    name: 'functest-verify-build-aarch64-builders-macro'
-    builders:
-      - shell: |
-          echo "Not activated!"
-
-- builder:
-    name: 'functest-upload-doc-artifact'
-    builders:
-      - shell: |
-          cd $WORKSPACE && tox -edocs
-            wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/build" "docs"
 ################################
 # job publishers
 ################################
                 unhealthy: 40
                 failing: 30
       - email-jenkins-admins-on-failure
-
-- publisher:
-    name: 'functest-verify-build-x86_64-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
-
-- publisher:
-    name: 'functest-verify-build-aarch64-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
index 785bd35..8d20dd2 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
-      - gambia:
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
index 4951352..8fe3659 100644 (file)
     tag:
       - latest:
           branch: master
+          slave: lf-virtual9
+      - iruya:
+          branch: stable/iruya
+          slave: lf-virtual4
       - hunter:
           branch: stable/hunter
+          slave: lf-virtual6
 
 - parameter:
     name: functest-slave
     parameters:
       - label:
           name: slave
-          default: functest-virtual
+          default: '{slave}'
 
 - parameter:
     name: functest-branch
           else
             image={repo}:{port}/{container}:{tag}
           fi
+          if [ "{tag}" = "latest" ]; then
+            py=3.6
+          else
+            py=2.7
+          fi
           sudo docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=True \
             -e EXTERNAL_NETWORK=public \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
+            -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\
+          site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
+            -v /home/opnfv/functest/tempest_blacklist.yaml:/usr/lib/python$py/\
+          site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/blacklist.yaml \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-pull'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-pull-containers:
           <<: *functest-containers
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-rmi'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-remove-images:
           <<: *functest-containers
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-{test}-run'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
       - neutron-tempest-plugin-api
       - rally_sanity
       - refstack_defcore
+      - refstack_compute
+      - refstack_object
+      - refstack_platform
       - tempest_full
       - tempest_scenario
       - patrole
       - networking-bgpvpn
       - networking-sfc
       - barbican
+    exclude:
+      - tag: latest
+        test: refstack_defcore
+      - tag: iruya
+        test: refstack_defcore
+      - tag: hunter
+        test: refstack_compute
+      - tag: hunter
+        test: refstack_object
+      - tag: hunter
+        test: refstack_platform
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     scm:
       - functest-scm:
           ref: $GERRIT_REFSPEC
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-check'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
     scm:
     port:
     container: alpine
     tag: 3.9
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
     port:
     container: alpine
     tag: 3.9
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
     name: 'functest-{tag}-check'
     project-type: multijob
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
     properties:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
       - functest-patchset-created:
           branch: '{branch}'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-refstack_platform-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *functest-jobs
       - multijob:
           name: opnfv/functest-vnf:{tag}
+          execution-type: SEQUENTIALLY
           projects:
             - name: 'functest-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *functest-jobs
index f45e25c..510a55e 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
index e141f78..39e73b7 100644 (file)
     jobs:
       - 'xtesting-verify-{stream}'
       - 'xtesting-verify-{phase}-{stream}'
-      - 'xtesting-docs-upload-{stream}'
 
     stream:
       - master:
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - hunter: &hunter
+      - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
-      - gambia: &gambia
+      - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
     phase:
       - 'unit-tests-and-docs':
           slave-label: 'opnfv-build-ubuntu'
-      - 'build-x86_64':
-          slave-label: 'opnfv-build-ubuntu'
-      - 'build-aarch64':
-          slave-label: 'opnfv-build-ubuntu-arm'
 
 - job-template:
     name: 'xtesting-verify-{stream}'
               node-parameters: false
               kill-phase-on: FAILURE
               abort-all-job: false
-            - name: 'xtesting-verify-build-x86_64-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                ARCH=x86_64
-              git-revision: true
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: false
-            - name: 'xtesting-verify-build-aarch64-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-                ARCH=aarch64
-              git-revision: true
-              node-parameters: false
-              kill-phase-on: FAILURE
-              abort-all-job: false
 
 - job-template:
     name: 'xtesting-verify-{phase}-{stream}'
     publishers:
       - 'xtesting-verify-{phase}-publishers-macro'
 
-- job-template:
-    name: 'xtesting-docs-upload-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-
-    scm:
-      - git-scm
-
-    triggers:
-      - 'xtesting-docs-upload-triggers-macro':
-          project: '{project}'
-          branch: '{branch}'
-
-    builders:
-      - xtesting-upload-doc-artifact
-
 ################################
 # job triggers
 ################################
                 - compare-type: ANT
                   pattern: 'docs/**|.gitignore'
 
-- trigger:
-    name: 'xtesting-docs-upload-triggers-macro'
-    triggers:
-      - gerrit:
-          server-name: 'gerrit.opnfv.org'
-          trigger-on:
-            - change-merged-event
-            - comment-added-contains-event:
-                comment-contains-value: 'remerge'
-          projects:
-            - project-compare-type: 'ANT'
-              project-pattern: '{project}'
-              branches:
-                - branch-compare-type: 'ANT'
-                  branch-pattern: '**/{branch}'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**|.gitignore'
 ################################
 # job builders
 ################################
       - shell: |
           cd $WORKSPACE && tox
 
-- builder:
-    name: 'xtesting-verify-build-x86_64-builders-macro'
-    builders:
-      - shell: |
-          echo "Not activated!"
-
-- builder:
-    name: 'xtesting-verify-build-aarch64-builders-macro'
-    builders:
-      - shell: |
-          echo "Not activated!"
-
-- builder:
-    name: 'xtesting-upload-doc-artifact'
-    builders:
-      - shell: |
-          cd $WORKSPACE && tox -edocs
-            wget -O - https://git.opnfv.org/releng/plain/utils/upload-artifact.sh | bash -s "api/_build" "docs"
 ################################
 # job publishers
 ################################
                 unhealthy: 40
                 failing: 30
       - email-jenkins-admins-on-failure
-
-- publisher:
-    name: 'xtesting-verify-build-x86_64-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
-
-- publisher:
-    name: 'xtesting-verify-build-aarch64-publishers-macro'
-    publishers:
-      - email-jenkins-admins-on-failure
index 2c5babd..48c0952 100644 (file)
@@ -10,6 +10,8 @@
     tag:
       - latest:
           branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
 
@@ -96,6 +98,7 @@
           fi
           sudo docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=true \
             $image run_tests -t {test}
           res=$?
           gsutil -m cp -r $WORKSPACE/ \
index e584107..a6ee7fa 100644 (file)
     gerrit-server-name: 'gerrit.opnfv.org'
     jenkins-ssh-credential: 'd42411ac011ad6f3dd2e1fa34eaa5d87f910eb2e'
     lftools-version: '<1.0.0'
+    throttle_categories: []
+    throttle-enabled: true
+    throttle-max-per-node: 1
+    throttle-max-total: 2
+    throttle-option: project
+
 
     properties:
       - logrotate-default
index 4ff5d67..a415546 100644 (file)
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-baremetal-hunter-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-baremetal-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
+
 - parameter:
     name: 'apex-baremetal-gambia-defaults'
     parameters:
           default: /root/.ssh/id_rsa
           description: 'SSH key to use for Apex'
 
+- parameter:
+    name: 'apex-virtual-hunter-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'apex-virtual-master'
+          all-nodes: false
+          node-eligibility: 'ignore-offline'
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: SSH_KEY
+          default: /root/.ssh/id_rsa
+          description: 'SSH key to use for Apex'
+
 - parameter:
     name: 'apex-virtual-gambia-defaults'
     parameters:
           default: https://gerrit.opnfv.org/gerrit/$PROJECT
           description: 'Git URL to use on this Jenkins Slave'
 
+- parameter:
+    name: 'itri-pod1-defaults'
+    parameters:
+      - node:
+          name: SLAVE_NAME
+          description: 'Slave name on Jenkins'
+          allowed-slaves:
+            - itri-pod1
+          default-slaves:
+            - itri-pod1
+      - string:
+          name: GIT_BASE
+          default: https://gerrit.opnfv.org/gerrit/$PROJECT
+          description: 'Git URL to use on this Jenkins Slave'
+      - string:
+          name: INSTALLER_IP
+          default: '10.20.0.2'
+          description: 'IP of the installer'
+
 - parameter:
     name: 'huawei-pod3-defaults'
     parameters:
index edaa1c3..e51173e 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - gambia:
           branch: 'stable/{stream}'
           disabled: false
diff --git a/jjb/joid/joid-daily-jobs.yaml b/jjb/joid/joid-daily-jobs.yaml
deleted file mode 100644 (file)
index 1766d61..0000000
+++ /dev/null
@@ -1,384 +0,0 @@
----
-########################
-# Job configuration for joid
-########################
-- project:
-
-    name: 'joid'
-
-    project: '{name}'
-
-    installer: '{name}'
-
-    # -------------------------------
-    # BRANCH ANCHORS
-    # -------------------------------
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      disabled: true
-      gs-pathname: '/{stream}'
-    master: &master
-      stream: master
-      branch: '{stream}'
-      disabled: true
-      gs-pathname: ''
-    # -------------------------------
-    # POD, INSTALLER, AND BRANCH MAPPING
-    # -------------------------------
-    #        CI PODs
-    # -------------------------------
-    pod:
-      - baremetal:
-          slave-label: joid-baremetal
-          <<: *fraser
-      - baremetal:
-          slave-label: joid-baremetal
-          <<: *master
-    # -------------------------------
-    # scenarios
-    # -------------------------------
-    scenario:
-      - 'os-nosdn-nofeature-noha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'os-nosdn-nofeature-ha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'os-nosdn-lxd-ha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'os-nosdn-lxd-noha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'os-odl_l2-nofeature-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
-      - 'os-odl_l2-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
-      - 'os-ocl-nofeature-ha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'os-ocl-nofeature-noha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'k8-nosdn-nofeature-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
-      - 'k8-nosdn-lb-noha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'k8-ovn-lb-noha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'os-nosdn-openbaton-ha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'k8-canal-lb-noha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'k8-nosdn-lb_ceph-noha':
-          auto-trigger-name: 'joid-{scenario}-{pod}-{stream}-trigger'
-      - 'k8-multus-lb-noha':
-          auto-trigger-name: 'daily-trigger-disabled'
-      - 'os-ovn-nofeature-ha':
-          auto-trigger-name: 'daily-trigger-disabled'
-
-    jobs:
-      - 'joid-{scenario}-{pod}-daily-{stream}'
-      - 'joid-deploy-{pod}-daily-{stream}'
-
-########################
-# job templates
-########################
-- job-template:
-    name: 'joid-{scenario}-{pod}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: false
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'joid-(os|k8)-.*?-{pod}-daily-.*'
-          blocking-level: 'NODE'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-
-    triggers:
-      - '{auto-trigger-name}'
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: '{scenario}'
-
-    builders:
-      - description-setter:
-          description: "POD: $NODE_NAME"
-      - trigger-builds:
-          - project: 'joid-deploy-{pod}-daily-{stream}'
-            current-parameters: true
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            same-node: true
-            block: true
-      - trigger-builds:
-          - project: 'functest-joid-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            block: true
-            same-node: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-      - trigger-builds:
-          - project: 'yardstick-joid-{pod}-daily-{stream}'
-            current-parameters: false
-            predefined-parameters:
-              DEPLOY_SCENARIO={scenario}
-            block: true
-            same-node: true
-            block-thresholds:
-              build-step-failure-threshold: 'never'
-              failure-threshold: 'never'
-              unstable-threshold: 'FAILURE'
-# 1.dovetail only euphrates by now, not sync with A/B/C branches
-# 2.here the stream means the SUT stream, dovetail stream is defined in
-#   its own job
-# 3.only debug testsuite here(includes basic testcase,
-#   i.e. one tempest smoke ipv6, two vping from functest)
-# 4.not used for release criteria or compliance,
-#   only to debug the dovetail tool bugs with joid
-# - trigger-builds:
-#     - project: 'dovetail-joid-{pod}-proposed_tests-{stream}'
-#       current-parameters: false
-#       predefined-parameters:
-#         DEPLOY_SCENARIO={scenario}
-#       block: true
-#       same-node: true
-#       block-thresholds:
-#         build-step-failure-threshold: 'never'
-#         failure-threshold: 'never'
-#         unstable-threshold: 'FAILURE'
-
-- job-template:
-    name: 'joid-deploy-{pod}-daily-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'joid-deploy-{pod}-daily-.*'
-          blocking-level: 'NODE'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER - Scenario: $DEPLOY_SCENARIO'
-      - timeout:
-          timeout: 180
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults':
-          installer: '{installer}'
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-nofeature-ha'
-
-    scm:
-      - git-scm
-
-    builders:
-      - description-setter:
-          description: "POD: $NODE_NAME"
-      - 'builder-macro'
-########################
-# builder macros
-########################
-- builder:
-    name: 'builder-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-          echo "Running $INSTALLER_TYPE with controller $SDN_CONTROLLER"
-          echo
-          echo "------ First Executing clean.sh ------"
-          cd $WORKSPACE/ci
-          ./clean.sh
-      - shell:
-          !include-raw: ./joid-deploy.sh
-
-########################
-# trigger macros
-########################
-# os-nosdn-nofeature-ha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 2 * * *'
-# os-nosdn-nofeature-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 2 * * *'
-# os-odl_l2-nofeature-ha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 7 * * *'
-# os-odl_l2-nofeature-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-odl_l2-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 7 * * *'
-# os-nosdn-lxd-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 22 * * *'
-# os-nosdn-lxd-noha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-lxd-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 22 * * *'
-# os-nosdn-lxd-ha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 10 * * *'
-# os-nosdn-lxd-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-lxd-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 10 * * *'
-# os-nosdn-nofeature-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 4 * * *'
-# os-nosdn-nofeature-noha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-nofeature-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 4 * * *'
-# k8-nosdn-nofeature-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 15 * * *'
-# k8-nosdn-nofeature-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-nosdn-nofeature-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 15 * * *'
-# k8-nosdn-lb-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-k8-nosdn-lb-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 20 * * *'
-# k8-nosdn-lb-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-nosdn-lb-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 20 * * *'
-# k8-ovn-lb-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-k8-ovn-lb-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 17 * * *'
-# k8-ovn-lb-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-ovn-lb-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 17 * * *'
-# os-nosdn-openbaton-ha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-nosdn-openbaton-ha-baremetal-fraser-trigger'
-    triggers:
-      - timed: ''  # Disabled as there is no branch for orchestra
-# os-nosdn-openbaton-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-nosdn-openbaton-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 23 * * *'
-# os-ocl-nofeature-ha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-ocl-nofeature-ha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 13 * * *'
-# os-ocl-nofeature-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-ocl-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 13 * * *'
-# os-ocl-nofeature-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-ocl-nofeature-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 16 * * *'
-# os-ocl-nofeature-noha trigger - branch: master
-- trigger:
-    name: 'joid-os-ocl-nofeature-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 16 * * *'
-# k8-canal-lb-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-k8-canal-lb-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 14 * * *'
-# k8-canal-lb-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-canal-lb-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 14 * * *'
-# k8-multus-lb-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-k8-multus-lb-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 18 * * *'
-# k8-multus-lb-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-multus-lb-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 18 * * *'
-# k8-nosdn-lb_ceph-noha trigger - branch: fraser
-- trigger:
-    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 18 * * *'
-# k8-nosdn-lb_ceph-noha trigger - branch: master
-- trigger:
-    name: 'joid-k8-nosdn-lb_ceph-noha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 18 * * *'
-# os-ovn-nofeature-ha trigger - branch: fraser
-- trigger:
-    name: 'joid-os-ovn-nofeature-ha-baremetal-fraser-trigger'
-    triggers:
-      - timed: '5 19 * * *'
-# os-ovn-nofeature-ha trigger - branch: master
-- trigger:
-    name: 'joid-os-ovn-nofeature-ha-baremetal-master-trigger'
-    triggers:
-      - timed: '5 19 * * *'
diff --git a/jjb/joid/joid-deploy.sh b/jjb/joid/joid-deploy.sh
deleted file mode 100644 (file)
index 9740d38..0000000
+++ /dev/null
@@ -1,160 +0,0 @@
-#!/bin/bash
-# SPDX-license-identifier: Apache-2.0
-##############################################################################
-# Copyright (c) 2016 Orange and others.
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-##############################################################################
-set +e
-set -o nounset
-
-##
-## Functions
-##
-function exit_on_error {
-    RES=$1
-    MSG=$2
-    if [ $RES != 0 ]; then
-        echo "FAILED - $MSG"
-        exit $RES
-    fi
-}
-
-##
-## Create LAB_CONFIG folder if not exists
-##
-
-mkdir -p $LAB_CONFIG
-
-##
-## Set Joid pod config name
-##
-
-case $NODE_NAME in
-    *virtual*)
-        POD=default ;;
-    *)
-        POD=$NODE_NAME ;;
-esac
-export POD_NAME=${POD/-}
-
-##
-## Redeploy MAAS or recover the previous config
-##
-
-cd $WORKSPACE/ci
-
-if [ -e "$LAB_CONFIG/deployconfig.yaml" ] && [ "$MAAS_REINSTALL" == "false" ]; then
-    echo "------ Recover Juju environment to use MAAS ------"
-    if [ ! -e deployconfig.yaml ]; then
-        cp $LAB_CONFIG/deployconfig.yaml .
-        cp $LAB_CONFIG/deployment.yaml .
-        cp $LAB_CONFIG/labconfig.yaml .
-    fi
-else
-    if ["$NODE_NAME" == "default" ]; then
-        echo "------ Redeploy MAAS ------"
-        ./03-maasdeploy.sh default
-        exit_on_error $? "MAAS Deploy FAILED"
-    else
-        echo "------ Redeploy MAAS ------"
-        ./03-maasdeploy.sh custom $LAB_CONFIG/labconfig.yaml
-        exit_on_error $? "MAAS Deploy FAILED"
-    fi
-fi
-
-##
-## Configure Joid deployment
-##
-
-# Based on scenario naming we can get joid options
-# naming convention:
-#    <model>-<controller>-<nfvfeature>-<mode>[-<extrastuff>]
-# With parameters:
-#    model=(os|k8)
-#    controller=(nosdn|odl_l3|odl_l2|onos|ocl)
-#       No odl_l3 today
-#    nfvfeature=(kvm|ovs|dpdk|nofeature)
-#       '_' list separated.
-#    mode=(ha|noha)
-#    extrastuff=(none)
-#       Optional field - Not used today
-
-IFS='-' read -r -a DEPLOY_OPTIONS <<< "${DEPLOY_SCENARIO}--"
-#last -- need to avoid nounset error
-
-JOID_MODEL=${DEPLOY_OPTIONS[0]}
-SDN_CONTROLLER=${DEPLOY_OPTIONS[1]}
-NFV_FEATURES=${DEPLOY_OPTIONS[2]}
-HA_MODE=${DEPLOY_OPTIONS[3]}
-EXTRA=${DEPLOY_OPTIONS[4]}
-
-if [ "$SDN_CONTROLLER" == 'odl_l2' ] || [ "$SDN_CONTROLLER" == 'odl_l3' ]; then
-    SDN_CONTROLLER='odl'
-fi
-
-# Add extra to features
-if [ "$EXTRA" != "" ];then
-    NFV_FEATURES="${NFV_FEATURES}_${EXTRA}"
-fi
-
-# temporary sfc feature is availble only on onos and trusty
-if [ "$NFV_FEATURES" == 'sfc' ] && [ "$SDN_CONTROLLER" == 'onos' ];then
-    UBUNTU_DISTRO=trusty
-fi
-
-##
-## Configure Joid deployment
-##
-
-if [ "$JOID_MODEL" == 'k8' ]; then
-  echo "------ Deploy with juju ------"
-  echo "Execute: ./deploy.sh -m $JOID_MODEL -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES"
-
-  ./deploy.sh -m kubernetes -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES
-  exit_on_error $? "Main deploy FAILED"
-fi
-
-##
-## Set Admin RC
-##
-if [ "$JOID_MODEL" == 'os' ]; then
-  echo "------ Deploy with juju ------"
-  echo "Execute: ./deploy.sh -m $JOID_MODEL -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES"
-
-  ./deploy.sh -m openstack -t $HA_MODE -o $OS_RELEASE -s $SDN_CONTROLLER -l $POD_NAME -d $UBUNTU_DISTRO -f $NFV_FEATURES
-  exit_on_error $? "Main deploy FAILED"
-
-  JOID_ADMIN_OPENRC=$LAB_CONFIG/admin-openrc
-  echo "------ Create OpenRC file [$JOID_ADMIN_OPENRC] ------"
-
-  # get controller IP
-  case "$SDN_CONTROLLER" in
-      "odl")
-          SDN_CONTROLLER_IP=$(juju status odl-controller/0 |grep public-address|sed -- 's/.*\: //')
-          ;;
-      "onos")
-          SDN_CONTROLLER_IP=$(juju status onos-controller/0 |grep public-address|sed -- 's/.*\: //')
-          ;;
-      *)
-          SDN_CONTROLLER_IP='none'
-          ;;
-  esac
-  SDN_PASSWORD='admin'
-
-  # export the openrc file by getting the one generated by joid and add SDN
-  # controller for Functest
-  # cp ./cloud/admin-openrc $JOID_ADMIN_OPENRC
-  echo export SDN_CONTROLLER=$SDN_CONTROLLER_IP >> $JOID_ADMIN_OPENRC
-  echo export SDN_PASSWORD=$SDN_PASSWORD >> $JOID_ADMIN_OPENRC
-
-fi
-
-##
-## Exit success
-##
-
-echo "Deploy success"
-exit 0
diff --git a/jjb/joid/joid-rtd-jobs.yaml b/jjb/joid/joid-rtd-jobs.yaml
deleted file mode 100644 (file)
index 14d171c..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- project:
-    name: joid-rtd
-    project: joid
-    project-name: joid
-
-    project-pattern: 'joid'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-joid/47371/'
-    rtd-token: '44a666161d99c9f53e7f69e56f1704694502015b'
-
-    jobs:
-      - '{project-name}-rtd-jobs'
diff --git a/jjb/joid/joid-verify-jobs.yaml b/jjb/joid/joid-verify-jobs.yaml
deleted file mode 100644 (file)
index d7cdec6..0000000
+++ /dev/null
@@ -1,213 +0,0 @@
----
-- project:
-    name: 'joid-verify-jobs'
-
-    project: 'joid'
-
-    installer: 'joid'
-    #####################################
-    # branch definitions
-    #####################################
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: true
-      - fraser: &fraser
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: true
-    #####################################
-    # patch verification phases
-    #####################################
-    phase:
-      - 'basic':
-          slave-label: 'opnfv-build-ubuntu'
-      - 'deploy-virtual':
-          slave-label: 'joid-virtual'
-      - 'smoke-test':
-          slave-label: 'joid-virtual'
-    #####################################
-    # jobs
-    #####################################
-    jobs:
-      - 'joid-verify-{stream}'
-      - 'joid-verify-{phase}-{stream}'
-#####################################
-# job templates
-#####################################
-- job-template:
-    name: 'joid-verify-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    project-type: multijob
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'joid-verify-master'
-            - 'joid-verify-danube'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm-gerrit
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    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}'
-              disable-strict-forbidden-file-verification: 'true'
-              forbidden-file-paths:
-                - compare-type: ANT
-                  pattern: 'docs/**|.gitignore'
-          readable-message: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'joid-virtual-defaults'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - multijob:
-          name: basic
-          condition: SUCCESSFUL
-          projects:
-            - name: 'joid-verify-basic-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              kill-phase-on: FAILURE
-              abort-all-job: true
-      - multijob:
-          name: deploy-virtual
-          condition: SUCCESSFUL
-          projects:
-            - name: 'joid-verify-deploy-virtual-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$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
-      - multijob:
-          name: smoke-test
-          condition: SUCCESSFUL
-          projects:
-            - name: 'joid-verify-smoke-test-{stream}'
-              current-parameters: false
-              predefined-parameters: |
-                BRANCH=$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
-
-- job-template:
-    name: 'joid-verify-{phase}-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-total: 4
-          max-per-node: 1
-          option: 'project'
-      - build-blocker:
-          use-build-blocker: true
-          blocking-jobs:
-            - 'joid-verify-deploy-.*'
-            - 'joid-verify-test-.*'
-          blocking-level: 'NODE'
-
-    scm:
-      - git-scm-gerrit
-
-    wrappers:
-      - ssh-agent-wrapper
-      - timeout:
-          timeout: 360
-          fail: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults'
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - '{project}-verify-{phase}-macro'
-#####################################
-# builder macros
-#####################################
-- builder:
-    name: 'joid-verify-basic-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Not activated!"
-
-- builder:
-    name: 'joid-verify-deploy-virtual-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Not activated!"
-
-- builder:
-    name: 'joid-verify-smoke-test-macro'
-    builders:
-      - shell: |
-          #!/bin/bash
-
-          echo "Not activated!"
diff --git a/jjb/multisite/multisite-rtd-jobs.yaml b/jjb/multisite/multisite-rtd-jobs.yaml
deleted file mode 100644 (file)
index 4e7f9e5..0000000
+++ /dev/null
@@ -1,12 +0,0 @@
----
-- project:
-    name: multisite-rtd
-    project: multisite
-    project-name: multisite
-
-    project-pattern: 'multisite'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-multisite/47374/'
-    rtd-token: '5d5b5c20e10df51eec38593b76d96cd22d4f1a96'
-
-    jobs:
-      - '{project-name}-rtd-jobs'
diff --git a/jjb/netready/netready-gluon-build.sh b/jjb/netready/netready-gluon-build.sh
deleted file mode 100755 (executable)
index 141e84c..0000000
+++ /dev/null
@@ -1,42 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o nounset
-set -o pipefail
-
-echo "Building Gluon packages."
-echo "------------------------"
-echo
-
-OPNFV_ARTIFACT_VERSION=$(echo $(date -u +"%Y%m%d"))
-
-# build all packages
-cd $WORKSPACE/ci
-./build-gluon-packages.sh
-
-# list the contents of BUILD_OUTPUT directory
-echo "Build Directory is ${BUILD_DIRECTORY}"
-echo "Build Directory Contents:"
-echo "---------------------------------------"
-ls -alR $BUILD_DIRECTORY
-
-# get version infos from Gluon from spec
-GLUON_VERSION=$(grep Version: $BUILD_DIRECTORY/rpm_specs/gluon.spec | awk '{ print $2 }')
-GLUON_RELEASE=$(grep 'define release' $BUILD_DIRECTORY/rpm_specs/gluon.spec | awk '{ print $3 }')_$OPNFV_ARTIFACT_VERSION
-
-ARTIFACT_NAME=gluon-$GLUON_VERSION-$GLUON_RELEASE.noarch.rpm
-ARTIFACT_PATH=$BUILD_DIRECTORY/noarch/$ARTIFACT_NAME
-
-echo "Writing opnfv.properties file"
-# save information regarding artifact into file
-(
-  echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION"
-  echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)"
-  echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)"
-  echo "OPNFV_ARTIFACT_URL=$GS_URL/$ARTIFACT_NAME"
-  echo "OPNFV_ARTIFACT_SHA512SUM=$(sha512sum $ARTIFACT_PATH | cut -d' ' -f1)"
-  echo "OPNFV_BUILD_URL=$BUILD_URL"
-  echo "ARTIFACT_LIST=$ARTIFACT_PATH"
-) > $WORKSPACE/opnfv.properties
-
-echo "---------------------------------------"
-echo "Done!"
diff --git a/jjb/netready/netready-rtd-jobs.yaml b/jjb/netready/netready-rtd-jobs.yaml
deleted file mode 100644 (file)
index ce46b33..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: netready-rtd
-    project: netready
-    project-name: netready
-
-    gerrit-skip-vote: true
-    project-pattern: 'netready'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-netready/47375/'
-    rtd-token: '3defd5720db87d5fd6487702e2778053b9279c28'
-
-    jobs:
-      - '{project-name}-rtd-jobs'
diff --git a/jjb/netready/netready-upload-gluon-packages.sh b/jjb/netready/netready-upload-gluon-packages.sh
deleted file mode 100755 (executable)
index 7c1e337..0000000
+++ /dev/null
@@ -1,27 +0,0 @@
-#!/bin/bash
-set -o errexit
-set -o nounset
-set -o pipefail
-
-echo "Uploading Gluon packages"
-echo "--------------------------------------------------------"
-echo
-
-source $WORKSPACE/opnfv.properties
-
-for artifact in $ARTIFACT_LIST; do
-  echo "Uploading artifact: ${artifact}"
-  gsutil cp $artifact gs://$GS_URL/$(basename $artifact) > gsutil.$(basename $artifact).log
-  echo "Upload complete for ${artifact}"
-done
-
-gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log
-gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.properties.log
-
-echo "--------------------------------------------------------"
-echo "Upload done!"
-
-echo "Artifacts are not available as:"
-for artifact in $ARTIFACT_LIST; do
-  echo "http://$GS_URL/$(basename $artifact)"
-done
diff --git a/jjb/netready/netready.yaml b/jjb/netready/netready.yaml
deleted file mode 100644 (file)
index 7980293..0000000
+++ /dev/null
@@ -1,69 +0,0 @@
----
-- project:
-    name: netready
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-{stream}'
-      - 'netready-build-gluon-packages-daily-{stream}'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-
-- job-template:
-    name: 'netready-build-gluon-packages-daily-{stream}'
-
-    disabled: true
-
-    concurrent: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - 'opnfv-build-ubuntu-defaults'
-      - 'netready-parameter':
-          gs-pathname: '{gs-pathname}'
-
-    scm:
-      - git-scm
-
-    builders:
-      - 'netready-gluon-build'
-
-    triggers:
-      - timed: '@midnight'
-
-
-########################
-# builder macros
-########################
-
-- builder:
-    name: 'netready-gluon-build'
-    builders:
-      - shell:
-          !include-raw: ./netready-gluon-build.sh
-      - shell:
-          !include-raw: ./netready-upload-gluon-packages.sh
-
-
-########################
-# parameter macros
-########################
-
-- parameter:
-    name: netready-parameter
-    parameters:
-      - string:
-          name: BUILD_DIRECTORY
-          default: $WORKSPACE/build
-          description: "Directory where the build artifact will be located upon the completion of the build."
-      - string:
-          name: GS_URL
-          default: artifacts.opnfv.org/$PROJECT{gs-pathname}
-          description: "URL to Google Storage."
index ec6776f..a9efb27 100644 (file)
@@ -44,8 +44,7 @@
       - gerrit:
           server-name: 'gerrit.opnfv.org'
           trigger-on:
-            - comment-added-contains-event:
-                comment-contains-value: 'buildvm'
+            - change-merged-event
           projects:
             - project-compare-type: 'ANT'
               project-pattern: '{project}'
@@ -96,3 +95,5 @@
     builders:
       - shell: |
           cd $WORKSPACE && tox
+          cd $WORKSPACE/nfvbenchvm/dib
+          bash verify-image.sh -v
diff --git a/jjb/octopus/octopus-rtd-jobs.yaml b/jjb/octopus/octopus-rtd-jobs.yaml
deleted file mode 100644 (file)
index 068ff3b..0000000
+++ /dev/null
@@ -1,13 +0,0 @@
----
-- project:
-    name: octopus-rtd
-    project: octopus
-    project-name: octopus
-
-    gerrit-skip-vote: true
-    project-pattern: 'octopus'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-octopus/47377/'
-    rtd-token: 'b3a1784dc55db91f38ea54cb181a0e4551221349'
-
-    jobs:
-      - '{project-name}-rtd-jobs'
index a8d29e4..598ff5b 100644 (file)
@@ -1,24 +1,22 @@
 ---
 - project:
     name: docs-rtd
+    project: 'opnfvdocs'
+    project-name: 'opnfvdocs'
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfvdocsdemo/79560/'
+    rtd-token: 'a96c3622a270344cf9bf3f73b0dfa04f59fc59c0'
+    project-pattern: 'opnfvdocs'
     jobs:
+      - '{project-name}-rtd-jobs'
       - 'docs-merge-rtd-{stream}'
       - 'docs-verify-rtd-{stream}'
 
     stream:
       - master:
           branch: 'master'
-      - gambia:
-          branch: 'stable/{stream}'
-      - fraser:
-          branch: 'stable/{stream}'
-      - danube:
+      - hunter:
           branch: 'stable/{stream}'
 
-    project: 'opnfvdocs'
-    rtdproject: 'opnfv'
-    # TODO: Archive Artifacts
-
 - job-template:
     name: 'docs-merge-rtd-{stream}'
 
 
     builders:
       - 'remove-old-docs-from-opnfv-artifacts'
-      - shell: |
-          if [ $GERRIT_BRANCH == "master" ]; then
-            RTD_BUILD_VERSION=latest
-          else
-            RTD_BUILD_VERSION=${{GERRIT_BRANCH/\//-}}
-          fi
-          curl -X POST --data "version_slug=$RTD_BUILD_VERSION" https://readthedocs.org/build/opnfvdocsdemo
-
 
 - job-template:
     name: 'docs-verify-rtd-{stream}'
index a974573..c82b0bd 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - fraser:
+      - hunter:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
diff --git a/jjb/promise/promise-rtd-jobs.yaml b/jjb/promise/promise-rtd-jobs.yaml
deleted file mode 100644 (file)
index d627326..0000000
+++ /dev/null
@@ -1,20 +0,0 @@
----
-- project:
-    name: promise-rtd
-    project: promise
-    project-name: promise
-
-    project-pattern: 'promise'
-    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-promise/47386/'
-    rtd-token: 'e689330ddc9401d83dd26efbe26a55a6ecd33a0d'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          disabled: false
-
-    jobs:
-      - '{project-name}-rtd-jobs'
diff --git a/jjb/promise/promise.yaml b/jjb/promise/promise.yaml
deleted file mode 100644 (file)
index 6e6fb54..0000000
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
-    name: promise
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'
index 7e87c5f..6ec3c89 100644 (file)
       stream: gambia
       branch: 'stable/{stream}'
       disabled: false
+    hunter: &hunter
+      stream: hunter
+      branch: 'stable/{stream}'
+      disabled: false
     dovetail-arm-receivers: &dovetail-arm-receivers
       receivers: >
           cristina.pauna@enea.com
@@ -44,6 +48,7 @@
     dockerdir: "docker"
     docker_repo_name: "opnfv/{project}_aarch64"
     arch_tag: ""
+    extra_build_args: ""
 
     # yamllint disable rule:key-duplicates
     dockerrepo:
           <<: *storperf-arm-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *gambia
+          <<: *hunter
           <<: *yardstick-arm-receivers
 
     # yamllint enable rule:key-duplicates
           name: ARCH_TAG
           default: "{arch_tag}"
           description: "If set, this value will be added to the docker image tag"
+      - string:
+          name: EXTRA_BUILD_ARGS
+          default: "{extra_build_args}"
+          description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
 
     properties:
       - throttle:
index e647641..174bb57 100644 (file)
@@ -130,12 +130,18 @@ if [[ -n "${ARCH_TAG}" ]]; then
     ARCH_BUILD_ARG="--build-arg ARCH=${ARCH_TAG}"
 fi
 
+EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS:-}
+if [ -n "${EXTRA_BUILD_ARGS}" ]; then
+    EXTRA_BUILD_ARGS=" "$(echo ${EXTRA_BUILD_ARGS})
+    EXTRA_BUILD_ARGS=${EXTRA_BUILD_ARGS// / --build-arg }
+fi
+
 # Start the build
 echo "Building docker image: $DOCKER_REPO_NAME:$DOCKER_TAG"
 echo "--------------------------------------------------------"
 echo
 cmd="docker build --pull=true --no-cache -t $DOCKER_REPO_NAME:$DOCKER_TAG --build-arg BRANCH=$BUILD_BRANCH
-    $ARCH_BUILD_ARG
+    $ARCH_BUILD_ARG $EXTRA_BUILD_ARGS
     -f $DOCKERFILE $DOCKER_PATH"
 
 echo ${cmd}
index 591452a..08c08ee 100644 (file)
       stream: gambia
       branch: 'stable/{stream}'
       disabled: false
+    hunter: &hunter
+      stream: hunter
+      branch: 'stable/{stream}'
+      disabled: false
     pharos-tools-receivers: &pharos_tools_receivers
       receivers: >
           pberberian@iol.unh.edu
           mark.beierl@emc.com
     yardstick-receivers: &yardstick-receivers
       receivers: >
-          limingjiang@huawei.com
           rexlee8776@gmail.com
-          emma.l.foley@intel.com
     other-receivers: &other-receivers
       receivers: ''
 
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     # This is the dockerhub repo the image will be pushed to as
     # 'opnfv/{dockerrepo}. See: DOCKER_REPO_NAME parameter.
           dockerfile: 'Dockerfile.web'
           <<: *master
           <<: *other-receivers
+      - 'dovetail-webportal-web-onap':
+          project: 'dovetail-webportal'
+          dockerfile: 'Dockerfile.web'
+          extra_build_args: 'CONTAINER=onap GUI=onap-ui'
+          <<: *master
+          <<: *other-receivers
       - 'nfvbench':
           project: 'nfvbench'
           <<: *master
           <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
-          <<: *gambia
+          <<: *hunter
           <<: *yardstick-receivers
       # projects with jobs for fraser
       - 'bottlenecks':
           project: 'bottlenecks'
-          <<: *fraser
+          <<: *hunter
           <<: *other-receivers
       - 'clover':
           project: 'clover'
     dockerfile: "Dockerfile"
     dockerdir: "docker"
     arch_tag: ""
+    extra_build_args: ""
 
     project:
       # projects with jobs for master
           name: ARCH_TAG
           default: "{arch_tag}"
           description: "If set, this value will be added to the docker image tag as a prefix"
+      - string:
+          name: EXTRA_BUILD_ARGS
+          default: "{extra_build_args}"
+          description: "Whitespace separated key=value pairs. If set, these args will be used to build docker image"
 
     properties:
       - throttle:
diff --git a/jjb/releng/releng-info-vote.yaml b/jjb/releng/releng-info-vote.yaml
new file mode 100644 (file)
index 0000000..8381858
--- /dev/null
@@ -0,0 +1,6 @@
+---
+- project:
+    name: info-vote
+    build-node: lf-build2
+    jobs:
+      - 'info-vote-verify'
index de585fd..0200376 100644 (file)
@@ -11,7 +11,8 @@ set -e -o pipefail
 echo "---> Create virtualenv"
 
 sudo -H pip install virtualenv
-virtualenv $WORKSPACE/venv
+virtualenv -p /usr/bin/python3 $WORKSPACE/venv
+
 # shellcheck source=$WORKSPACE/venv/bin/activate disable=SC1091
 source $WORKSPACE/venv/bin/activate
 pip install --upgrade pip
index d79771f..784d648 100644 (file)
@@ -16,6 +16,7 @@
       - fraser
       - gambia
       - hunter
+      - iruya
 
     jobs:
       - 'releng-release-{stream}-verify'
index 31f7aa6..47a6b54 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - gambia: &gambia
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
       - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: true
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
 
 - job-template:
     name: 'sfc-verify-{stream}'
index f7d4c9b..a65da54 100644 (file)
@@ -12,7 +12,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
index 10514c3..2055bc1 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: true
-      - fraser: &fraser
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: true
index 65e1d32..efbfbeb 100644 (file)
@@ -15,8 +15,8 @@
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    gambia: &gambia
-      stream: gambia
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       gs-pathname: '/{stream}'
       disabled: false
@@ -69,7 +69,7 @@
       - baremetal:
           slave-label: apex-baremetal-master
           installer: apex
-          <<: *gambia
+          <<: *hunter
     ## armband CI PODs
     # - armband-baremetal:
     #     slave-label: armband-baremetal
index 2acedd7..842aea6 100644 (file)
@@ -13,7 +13,7 @@
           gs-pathname: ''
           disabled: false
           docker-tag: 'latest'
-      - gambia: &gambia
+      - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
index 993094c..7da934d 100644 (file)
@@ -13,7 +13,7 @@
           gs-pathname: ''
           disabled: false
           docker-tag: 'latest'
-      - gambia: &gambia
+      - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
index 9981240..bf4f594 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
       - gambia:
           branch: 'stable/{stream}'
           disabled: false
index 9e987fe..d46a6cf 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - gambia: &gambia
+      - hunter: &hunter
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
index 59c1ebf..2c35f27 100755 (executable)
@@ -153,6 +153,45 @@ function determine_scenario() {
     SCENARIO_SHA=$(cd $WORK_DIRECTORY/$GERRIT_PROJECT && git rev-parse HEAD)
 }
 
+# This function allows developers to specify the specific XCI flavor for the
+# impacted scenario by adding the XCI Flavor info about the specific scenario.
+# This results in either skipping the real verification
+# totally or skipping the determining the installer and scenario programmatically.
+# It is important to note that this feature is only available to generic scenarios
+# and only single installer/scenario pair is allowed.
+# The input in commit message should be placed at the end of the commit message body,
+# before the signed-off and change-id lines.
+#
+# Pattern to be searched in Commit Message
+#   xci-flavor:<xci-flavor>
+# Examples:
+#   xci-flavor:noha
+function override_xci_flavor() {
+    echo "Processing $GERRIT_PROJECT patchset $GERRIT_REFSPEC"
+
+    # process commit message for XCI Flavor
+    if [[ "$GERRIT_CHANGE_COMMIT_MESSAGE" =~ "xci-flavor:" ]]; then
+        XCI_FLAVOR=$(echo $GERRIT_CHANGE_COMMIT_MESSAGE | awk '/xci-flavor:/' RS=" " | cut -d":" -f2)
+
+        if [[ -z "$XCI_FLAVOR" ]]; then
+            XCI_FLAVOR='mini'
+            echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them."
+            echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties
+            exit 0
+        else
+            echo "Recording the XCI flavor '$XCI_FLAVOR' for downstream jobs"
+            echo "XCI_FLAVOR=$XCI_FLAVOR" >> $WORK_DIRECTORY/scenario.properties
+            exit 0
+        fi
+    else
+        XCI_FLAVOR='mini'
+        echo "XCI flavor is not specified. The default is specified instead (i.e. mini). Falling back to programmatically determining them."
+        echo "XCI_FLAVOR=mini" >> $WORK_DIRECTORY/scenario.properties
+        exit 0
+    fi
+
+}
+
 echo "Determining the impacted scenario"
 
 declare -a DEPLOY_SCENARIO
@@ -169,6 +208,7 @@ if [[ $GERRIT_PROJECT == "releng-xci" ]]; then
     determine_default_scenario
 else
     determine_scenario
+    override_xci_flavor
 fi
 override_scenario
 
index 1c622ac..8c3ba85 100644 (file)
       branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
-    gambia: &gambia
-      stream: gambia
+    hunter: &hunter
+      stream: hunter
       branch: 'stable/{stream}'
       gs-pathname: '{stream}'
       docker-tag: 'stable'
-    # Temporary fraser entry, until all fraser-tied PODs below migrate to gambia
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      gs-pathname: '{stream}'
-      # In the meantime, docker image 'stable' will carry gambia contents, and
-      # there is no implemented way to build a docker image with 'fraser' tag.
-      # Available docker image tag options, as of 2018-10-03:
-      # - 'opnfv-6.2.1', built on 2018-07-02, is rather old.
-      # - 'ovp-2.0.0', built on 2018-09-21, is a good fit despite its name: it
-      #   was built using SHA1 6c10a2d9cc3fe10e0bdd73a0985ab767b9479afc, which
-      #   is the same as used for the most recent 'stable' docker image carrying
-      #   fraser contents, built on 2018-09-13 and used so far by the fraser-
-      #   tied PODs below.
-      # The alternative would be to create a new 'opnfv-6.2.2' git tag, but that
-      # would just build another image using the same SHA1 as for 'ovp-2.0.0'.
-      docker-tag: 'ovp-2.0.0'
     # -------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING
     # -------------------------------
           slave-label: apex-virtual-master
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       - baremetal:
           slave-label: apex-baremetal-master
           installer: apex
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
-      - virtual:
-          slave-label: apex-virtual-fraser
-          installer: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - baremetal:
-          slave-label: apex-baremetal-fraser
-          installer: apex
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       # fuel CI PODs
       - baremetal:
           slave-label: fuel-baremetal
           slave-label: fuel-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
           slave-label: armband-baremetal
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       - armband-virtual:
           slave-label: armband-virtual
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       # joid CI PODs
       - baremetal:
           slave-label: joid-baremetal
           slave-label: joid-baremetal
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       - virtual:
           slave-label: joid-virtual
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
           slave-label: compass-baremetal
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       - virtual:
           slave-label: compass-virtual
           installer: compass
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       # daisy CI PODs
       - baremetal:
           slave-label: daisy-baremetal
           slave-label: daisy-baremetal
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       - virtual:
           slave-label: daisy-virtual
           installer: daisy
           installer: joid
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *master
+      - itri-pod1:
+          slave-label: '{pod}'
+          installer: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *master
       - zte-pod1:
           slave-label: '{pod}'
           installer: fuel
           slave-label: '{pod}'
           installer: fuel
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *gambia
+          <<: *hunter
       - zte-pod2:
           slave-label: '{pod}'
           installer: daisy
           slave-label: '{pod}'
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       - zte-pod9:
           slave-label: '{pod}'
           installer: daisy
           slave-label: '{pod}'
           installer: daisy
           auto-trigger-name: 'daily-trigger-disabled'
-          <<: *fraser
+          <<: *hunter
       - orange-pod2:
           slave-label: '{pod}'
           installer: joid
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-virtual-fraser'
+    name: 'yardstick-params-apex-virtual-hunter'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND
           description: 'Arguments to use in order to choose the backend DB'
 
 - parameter:
-    name: 'yardstick-params-apex-baremetal-fraser'
+    name: 'yardstick-params-apex-baremetal-hunter'
     parameters:
       - string:
           name: YARDSTICK_DB_BACKEND
           default: '-i 104.197.68.199:8086'
           description: 'Arguments to use in order to choose the backend DB'
 
+- parameter:
+    name: 'yardstick-params-itri-pod1'
+    parameters:
+      - string:
+          name: YARDSTICK_DB_BACKEND
+          default: '-i 104.197.68.199:8086'
+          description: 'Arguments to use in order to choose the backend DB'
+
 - parameter:
     name: 'yardstick-params-zte-pod1'
     parameters:
index 58d590c..dfe1404 100755 (executable)
@@ -38,7 +38,11 @@ elif [[ ${INSTALLER_TYPE} == 'compass' ]]; then
         echo "export OS_CACERT=/etc/yardstick/os_cacert" >> ${HOME}/opnfv-openrc.sh
     fi
 elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
-    cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
+    if [[ "${DEPLOY_SCENARIO:0:2}" == 'k8' ]]; then
+        rc_file_vol="-v ${HOME}/admin.conf:/etc/yardstick/admin.conf"
+    else
+        cacert_file_vol="-v ${HOME}/os_cacert:/etc/ssl/certs/mcp_os_cacert"
+    fi
     sshkey="-v ${SSH_KEY}:/root/.ssh/mcp.rsa"
 fi
 
index 116d2f0..82744a4 100755 (executable)
@@ -9,5 +9,8 @@ if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
     elif [[ ${INSTALLER_TYPE} == 'compass' ]];then
         echo "Copy admin.conf to ${dest_path}"
         docker cp compass-tasks:/opt/admin.conf "${dest_path}"
+    elif [[ ${INSTALLER_TYPE} == 'fuel' ]];then
+        echo "Getting kubernetes config ..."
+        docker cp -L fuel:/opt/kubernetes.config "${dest_path}"
     fi
 fi
index ace2e02..726760e 100644 (file)
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - gambia: &gambia
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - fraser:
+      - hunter: &hunter
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false
index a18a655..213ec6a 100644 (file)
@@ -12,7 +12,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
 
index 59c205a..a04412c 100644 (file)
@@ -10,12 +10,18 @@ releases:
   - version: opnfv-7.1.0
     location:
       functest: b21dede23cb7577497fb7adf2775a77c45a37e36
+  - version: opnfv-7.2.0
+    location:
+      functest: 312f1481503e44fdb29857d528d8d641e408f929
   - version: opnfv-7.0.0
     location:
       functest-kubernetes: fd5c939094244458aea31ead8c6519da95266c2a
   - version: opnfv-7.1.0
     location:
       functest-kubernetes: fd5c939094244458aea31ead8c6519da95266c2a
+  - version: opnfv-7.2.0
+    location:
+      functest-kubernetes: 262e3a4e51183388091481a7593b11bc37f295fb
 
 branches:
   - name: stable/gambia
diff --git a/releases/hunter/apex.yaml b/releases/hunter/apex.yaml
new file mode 100644 (file)
index 0000000..397f3da
--- /dev/null
@@ -0,0 +1,23 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: apex
+project-type: installer
+release-model: stable
+upstream: https://wiki.openstack.org/wiki/TripleO
+
+releases:
+  - version: opnfv-8.0.0
+    location:
+      apex: 5a60fc71848a60ee51837b7dc7a49dda741876cd
+
+branches:
+  - name: stable/hunter
+    location:
+      apex: 8f294ab694a95e60abb29af6f1ef560ae365d436
diff --git a/releases/hunter/barometer.yaml b/releases/hunter/barometer.yaml
new file mode 100644 (file)
index 0000000..89b3022
--- /dev/null
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: barometer
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      barometer: 6fe9f36a63e71bd4614260cca0664b02b95c8b9c
diff --git a/releases/hunter/bottlenecks.yaml b/releases/hunter/bottlenecks.yaml
new file mode 100644 (file)
index 0000000..43c0553
--- /dev/null
@@ -0,0 +1,14 @@
+---
+project: bottlenecks
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb
+
+releases:
+  - version: opnfv-8.0.0
+    location:
+      bottlenecks: 80edaf3c201bec85fe8a403e03b68899c08df3bb
diff --git a/releases/hunter/clover.yaml b/releases/hunter/clover.yaml
new file mode 100644 (file)
index 0000000..f35dde8
--- /dev/null
@@ -0,0 +1,16 @@
+---
+project: clover
+project-type: feature
+release-model: stable
+
+releases:
+  - version: opnfv-8.0.0
+    location:
+      clover: 1301c1842b5b678a1c91ce6d81b1df85135186b6
+
+branches:
+  - name: stable/hunter
+    location:
+      clover: 3f86a3d611f4d2a4f21d9be2a2284ccf120db36e
+
+release-notes: https://opnfv-clover.readthedocs.io/en/stable-hunter/release/release-notes/release-notes.html
diff --git a/releases/hunter/container4nfv.yaml b/releases/hunter/container4nfv.yaml
new file mode 100644 (file)
index 0000000..dd119a3
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: container4nfv
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      container4nfv: 7a5ffe11c53e77e16383e712aad823e333b61aff
diff --git a/releases/hunter/cran.yaml b/releases/hunter/cran.yaml
new file mode 100644 (file)
index 0000000..3a11a4e
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: cran
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      cran: 60a2982c7b9de09880005b23da88bff0a8d59467
diff --git a/releases/hunter/doctor.yaml b/releases/hunter/doctor.yaml
new file mode 100644 (file)
index 0000000..1678d8c
--- /dev/null
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 Nokia Corporation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: doctor
+project-type: feature
+release-model: stable
+
+releases:
+  - version: opnfv-8.0.0
+    location:
+      doctor: 3eb8e9800215f25712d62160042e472f63cec1e1
+
+branches:
+  - name: stable/hunter
+    location:
+      doctor: 73605c5c34b97ab56306bfa9af0f5888f3c7e46d
+
+release-notes: https://opnfv-doctor.readthedocs.io/en/stable-hunter/release/release-notes/index.html#doctor-releasenotes
diff --git a/releases/hunter/edgecloud.yaml b/releases/hunter/edgecloud.yaml
new file mode 100644 (file)
index 0000000..54f98f0
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: edgecloud
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      edgecloud: 0aa38f991cc8defd2cf46bea93f16938a3d66927
diff --git a/releases/hunter/fds.yaml b/releases/hunter/fds.yaml
new file mode 100644 (file)
index 0000000..8c33218
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: fds
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      fds: 20cef81fd594f10949e151fd5a0a439af0a844e4
diff --git a/releases/hunter/fuel.yaml b/releases/hunter/fuel.yaml
new file mode 100644 (file)
index 0000000..e1e111f
--- /dev/null
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: fuel
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      fuel: f021e19b4797eb4f6830d86056fce919f1e1fe01
+
+releases:
+  - version: opnfv-8.0.0
+    location:
+      fuel: 4e64c8495d8cddab653e7b6f8db1d4335755d4c9
+
+release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html
index 064ae05..19f4431 100644 (file)
@@ -7,9 +7,15 @@ releases:
   - version: opnfv-8.0.0
     location:
       functest: a3355e22585c66823c430d6adcdef8dddacb33a1
+  - version: opnfv-8.1.0
+    location:
+      functest: 924f4a31ef22675630fa6009610074600b4f0e68
   - version: opnfv-8.0.0
     location:
       functest-kubernetes: ec2bf0e8bd1b4d3b2c4e2894820d2cbb454e36e7
+  - version: opnfv-8.1.0
+    location:
+      functest-kubernetes: d02aa9919eb04974d096fcd54891723482f8d056
 
 branches:
   - name: stable/hunter
diff --git a/releases/hunter/ipv6.yaml b/releases/hunter/ipv6.yaml
new file mode 100644 (file)
index 0000000..819100d
--- /dev/null
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: ipv6
+project-type: feature
+release-model: stable
+
+releases:
+  - version: opnfv-8.0.0
+    location:
+      ipv6: b113174fa52a1ac4bd20bdbdaea86b07897e7091
+
+branches:
+  - name: stable/hunter
+    location:
+      ipv6: 3084e2b829dc88a129ee9cdb65afa81986a6bfed
+
+release-notes: https://opnfv-ipv6.readthedocs.io/en/stable-hunter/release/release-notes/
diff --git a/releases/hunter/opnfvdocs.yaml b/releases/hunter/opnfvdocs.yaml
new file mode 100644 (file)
index 0000000..7853e02
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: opnfvdocs
+project-type: infra
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      opnfvdocs: e834a1712a717d6ab5f66d3c2b56e39f07f55f68
diff --git a/releases/hunter/samplevnf.yaml b/releases/hunter/samplevnf.yaml
new file mode 100644 (file)
index 0000000..66d0840
--- /dev/null
@@ -0,0 +1,11 @@
+---
+project: samplevnf
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      samplevnf: 8310d0fedb5fc13610b95e100c8639c97892a2b5
+
+release-notes: https://opnfv-samplevnf.readthedocs.io/en/latest/release/release-notes/release-notes.html
diff --git a/releases/hunter/stor4nfv.yaml b/releases/hunter/stor4nfv.yaml
new file mode 100644 (file)
index 0000000..22bff3b
--- /dev/null
@@ -0,0 +1,11 @@
+---
+project: stor4nfv
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      stor4nfv: fe427fc3f69ecc5e104a6fdb2c9f5d82f0254fdb
+
+release-notes: https://opnfv-stor4nfv.readthedocs.io/en/latest/release/release-notes/release-notes.html
diff --git a/releases/hunter/storperf.yaml b/releases/hunter/storperf.yaml
new file mode 100644 (file)
index 0000000..6abe0f2
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: storperf
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      storperf: cc15a771fa60ddd63ac0a7eee3b43eb9f8cf2334
diff --git a/releases/hunter/vswitchperf.yaml b/releases/hunter/vswitchperf.yaml
new file mode 100644 (file)
index 0000000..f0335f4
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: vswitchperf
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      vswitchperf: 589639d313c24104b2a27ef16baf716d1d274108
diff --git a/releases/hunter/yardstick.yaml b/releases/hunter/yardstick.yaml
new file mode 100644 (file)
index 0000000..f19ec3a
--- /dev/null
@@ -0,0 +1,16 @@
+---
+project: yardstick
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      yardstick: 85899baa90714ae15add21a330316793071168ae
+
+releases:
+  - version: opnfv-8.0.0
+    location:
+      yardstick: 9bd54d7914f4c025d4a50611f726d6154f914c7b
+
+release-notes: https://opnfv-yardstick.readthedocs.io/en/latest/release/release-notes/release-notes.html
diff --git a/releases/iruya/functest.yaml b/releases/iruya/functest.yaml
new file mode 100644 (file)
index 0000000..e44d819
--- /dev/null
@@ -0,0 +1,23 @@
+---
+project: functest
+project-type: testing
+release-model: stable
+
+releases:
+  - version: opnfv-9.0.0
+    location:
+      functest: 95aad4cafe073e62b8624dbf7a5d973feee8d988
+  - version: opnfv-9.0.0
+    location:
+      functest-kubernetes: 049c730a5cf97eff34c82dc0968d709d4cbec1db
+
+branches:
+  - name: stable/iruya
+    location:
+      functest: daf01598d6030a29ccddc3023ee94fe9b0e3b320
+  - name: stable/iruya
+    location:
+      functest-kubernetes: fd130c880d4d185153efe3e3e0aa24c95052c320
+  - name: stable/iruya
+    location:
+      functest-xtesting: 838fc2ffe26f06cb11455145b7e73c452e85c15d
index b3be0d6..e5e237d 100755 (executable)
@@ -61,7 +61,7 @@ elif [ "$installer_type" == "joid" ]; then
     info "Do nothing, config file has been provided in $HOME/joid_config/config for joid"
 elif [ "$installer_type" == "fuel" ]; then
     info "Getting kubernetes config ..."
-    docker cp fuel:/opt/kubernetes.config $dest_path
+    docker cp -L fuel:/opt/kubernetes.config $dest_path
 else
     error "Installer $installer_type is not supported by this script"
 fi
index 17c03b0..4716af9 100755 (executable)
@@ -218,5 +218,5 @@ do
 done
 
 jenkins_hostname="${jenkins_hostname:-build.opnfv.org/ci}"
-connectionstring="java -jar agent.jar -jnlpUrl https://"$jenkins_hostname"/computer/"$agent_name"/agent-agent.jnlp -secret "$agent_secret" -noCertificateCheck "
+connectionstring="java -jar agent.jar -jnlpUrl https://"$jenkins_hostname"/computer/"$agent_name"/slave-agent.jnlp -secret "$agent_secret" -noCertificateCheck "
 main "$@"
index 3a8b718..62c964d 100644 (file)
@@ -24,6 +24,7 @@ node_list=(\
 'lf-pod1' 'lf-pod2' \
 'lf-virtual2' 'lf-virtual3' \
 'intel-pod12' 'intel-pod18' \
+'itri-pod1' \
 'ericsson-pod1' 'ericsson-pod2' \
 'ericsson-virtual1' 'ericsson-virtual2'  'ericsson-virtual3' \
 'ericsson-virtual4' 'ericsson-virtual5' \