Merge "Switch opnfvdocs to use the global-jjb RTD jobs"
authorAric Gardner <agardner@linuxfoundation.org>
Wed, 8 May 2019 15:21:50 +0000 (15:21 +0000)
committerGerrit Code Review <gerrit@opnfv.org>
Wed, 8 May 2019 15:21:50 +0000 (15:21 +0000)
61 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/compass4nfv/compass-ci-jobs.yaml
jjb/dovetail/dovetail-run.sh
jjb/fuel/fuel-daily-jobs.yaml
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-weekly-jobs.yaml [deleted file]
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/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-jobs.yaml
jjb/sfc/sfc-project-jobs.yaml
jjb/sfc/sfc-rtd-jobs.yaml
jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
jjb/vswitchperf/vswitchperf.yaml
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/availability.yaml [new file with mode: 0644]
releases/hunter/clover.yaml [new file with mode: 0644]
releases/hunter/doctor.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/snaps.yaml [new file with mode: 0644]
releases/hunter/stor4nfv.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

index 5d1ddb5..623134d 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 5d1ddb578a5253fc360a73be6ceea89d65af043e
+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 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 04b11fd..ef11fc1 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
@@ -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}
 
index 982b83e..e567493 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
       # -------------------------------
           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,2,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: ''
 - 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
 # ----------------------------------------------
     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'
+    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-master-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'
-    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 * * *'
 - 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 * * *'
 - 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: ''
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 8c29249..4f3c9ef 100755 (executable)
@@ -10,23 +10,6 @@ TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results
 ENERGY_RECORDER_API_URL=http://energy.opnfv.fr/resources
 DOCKER_TAG=${DOCKER_TAG:-$([[ ${BRANCH##*/} == "master" ]] && echo "latest" || echo ${BRANCH##*/})}
 
-check_os_deployment() {
-    FUNCTEST_IMAGE=${REPO}/functest-healthcheck:${DOCKER_TAG}
-    echo "Functest: Pulling Functest Docker image ${FUNCTEST_IMAGE} ..."
-    docker pull ${FUNCTEST_IMAGE}>/dev/null
-    cmd="docker run --rm ${volumes} ${FUNCTEST_IMAGE} check_deployment"
-    echo "Checking deployment, CMD: ${cmd}"
-    eval ${cmd}
-    ret_value=$?
-    if [ ${ret_value} != 0 ]; then
-        echo "ERROR: Problem while checking OpenStack deployment."
-        exit 1
-    else
-        echo "OpenStack deployment OK."
-    fi
-
-}
-
 run_tiers() {
     tiers=$1
     cmd_opt="run_tests -r -t all"
@@ -122,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"
 
@@ -173,12 +157,15 @@ 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
 image-feature-enabled:
     api_v2: true
     api_v1: false
+object-storage:
+    operator_role: SwiftOperator
 volume:
     storage_protocol: ceph
 volume-feature-enabled:
@@ -191,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
@@ -242,12 +230,62 @@ volume-feature-enabled:
 EOF
     ;;
 esac
+case ${BRANCH} in
+master)
+    cat << EOF >> "${tempest_conf_yaml}"
+compute:
+    max_microversion: latest
+EOF
+    ;;
+stable/hunter)
+    cat << EOF >> "${tempest_conf_yaml}"
+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}"
 
 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}
 
@@ -263,21 +301,15 @@ elif [ ${FUNCTEST_MODE} == 'tier' ]; then
 else
     tests=()
     skip_tests=0
-    if [ ${DEPLOY_TYPE} == 'baremetal' ] && [ "${HOST_ARCH}" != "aarch64" ]; then
-        if [[ ${BRANCH} == "stable/fraser" ]]; then
-            tiers=(healthcheck smoke features vnf parser)
-            tests=(tempest_full_parallel)
-        elif [[ ${BRANCH} == "stable/gambia" ]]; then
+    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
     else
-        if [[ ${BRANCH} == "stable/fraser" ]]; then
-            tiers=(healthcheck smoke features parser)
-            tests=(tempest_full_parallel)
-        elif [[ ${BRANCH} == "stable/gambia" ]]; then
-            tiers=(healthcheck smoke benchmarking features vnf components)
+        if [[ ${BRANCH} == "stable/gambia" ]]; then
+            tiers=(healthcheck smoke benchmarking features components)
         else
             tiers=(healthcheck smoke benchmarking features)
         fi
index 34aee8a..1a94d51 100644 (file)
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
     gambia: &gambia
       stream: gambia
       branch: 'stable/{stream}'
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *gambia
-      - virtual:
-          slave-label: fuel-virtual
-          installer: fuel
-          <<: *gambia
-      - baremetal:
-          slave-label: fuel-baremetal
-          installer: fuel
-          <<: *fraser
+          <<: *hunter
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *fraser
-      # joid CI PODs
-      - baremetal:
-          slave-label: joid-baremetal
-          installer: joid
-          <<: *master
-      - virtual:
-          slave-label: joid-virtual
-          installer: joid
-          <<: *master
-      - baremetal:
-          slave-label: joid-baremetal
-          installer: joid
-          <<: *fraser
-      - virtual:
-          slave-label: joid-virtual
-          installer: joid
-          <<: *fraser
+          <<: *hunter
       # compass CI PODs
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          <<: *master
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          <<: *master
-      - arm-virtual:
-          slave-label: compass-arm-virtual
-          installer: compass
-          <<: *master
-      - baremetal:
-          slave-label: compass-baremetal
-          installer: compass
-          <<: *fraser
-      - virtual:
-          slave-label: compass-virtual
-          installer: compass
-          <<: *fraser
-      - arm-virtual:
-          slave-label: compass-arm-virtual
-          installer: compass
-          <<: *fraser
       - baremetal:
           slave-label: compass-baremetal
           installer: compass
           slave-label: compass-virtual
           installer: compass
           <<: *gambia
-      - arm-virtual:
-          slave-label: compass-arm-virtual
-          installer: compass
-          <<: *gambia
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
           slave-label: apex-baremetal-master
           installer: apex
           <<: *gambia
-      - virtual:
-          slave-label: apex-virtual-fraser
-          installer: apex
-          <<: *fraser
-      - baremetal:
-          slave-label: apex-baremetal-fraser
-          installer: apex
-          <<: *fraser
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
           <<: *master
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          <<: *master
-      - armband-baremetal:
-          slave-label: armband-baremetal
-          installer: fuel
-          <<: *gambia
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          <<: *gambia
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *fraser
-      - armband-virtual:
-          slave-label: armband-virtual
-          installer: fuel
-          <<: *fraser
-      # daisy CI PODs
-      - baremetal:
-          slave-label: daisy-baremetal
-          installer: daisy
-          <<: *master
-      - virtual:
-          slave-label: daisy-virtual
-          installer: daisy
-          <<: *master
-      - baremetal:
-          slave-label: daisy-baremetal
-          installer: daisy
-          <<: *fraser
-      - virtual:
-          slave-label: daisy-virtual
-          installer: daisy
-          <<: *fraser
-      # netvirt 3rd party ci
-      - virtual:
-          slave-label: odl-netvirt-virtual
-          installer: netvirt
-          <<: *master
-      # -------------------------------
-      #        None-CI PODs
-      # -------------------------------
-      - orange-pod1:
-          slave-label: '{pod}'
-          installer: joid
-          <<: *master
-      - orange-pod5:
-          slave-label: '{pod}'
-          installer: fuel
-          <<: *master
-      - orange-pod2:
-          slave-label: '{pod}'
-          installer: joid
-          <<: *master
-      - baremetal-centos:
-          slave-label: 'intel-pod8'
-          installer: compass
-          <<: *master
-      - nokia-pod1:
-          slave-label: '{pod}'
-          installer: apex
-          <<: *master
-      - zte-pod1:
-          slave-label: '{pod}'
-          installer: fuel
-          <<: *master
-      - zte-pod1:
-          slave-label: '{pod}'
-          installer: fuel
-          <<: *fraser
-      - zte-pod2:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *master
-      - zte-pod2:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *fraser
-      - zte-pod3:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *master
-      - zte-pod3:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *fraser
-      - zte-pod9:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *master
-      - zte-pod9:
-          slave-label: '{pod}'
-          installer: daisy
-          <<: *fraser
-    # -------------------------------
-    # PODs for verify jobs triggered by each patch upload
-    #   - ool-virtual1:
-    #       slave-label: '{pod}'
-    #       installer: apex
-    #       <<: *master
-    # -------------------------------
+          <<: *hunter
 
     testsuite:
       - 'suite':
index 71215ca..328ef7c 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
-      - fraser:
+      - gambia:
           branch: 'stable/{stream}'
           disabled: false
 
@@ -35,7 +35,6 @@
       - 'healthcheck'
       - 'features'
       - 'components'
-      - 'parser'
       - 'smoke'
       - 'benchmarking'
       - 'vnf'
     exclude:
       - stream: 'master'
         image: 'components'
-      - stream: 'hunter'
+      - stream: 'iruya'
         image: 'components'
-      - stream: 'master'
-        image: 'parser'
       - stream: 'hunter'
-        image: 'parser'
-      - stream: 'gambia'
-        image: 'parser'
-      - stream: 'fraser'
-        image: 'tempest'
-      - stream: 'fraser'
-        image: 'benchmarking'
+        image: 'components'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
               <<: *build-job-settings
             - name: 'functest-components-docker-build-arm64-{stream}'
               <<: *build-job-settings
-            - name: 'functest-parser-docker-build-amd64-{stream}'
-              <<: *build-job-settings
-            - name: 'functest-parser-docker-build-arm64-{stream}'
-              <<: *build-job-settings
             - name: 'functest-smoke-docker-build-amd64-{stream}'
               <<: *build-job-settings
             - name: 'functest-smoke-docker-build-arm64-{stream}'
               <<: *manifest-job-settings
             - name: 'functest-components-docker-manifest-{stream}'
               <<: *manifest-job-settings
-            - name: 'functest-parser-docker-manifest-{stream}'
-              <<: *manifest-job-settings
             - name: 'functest-smoke-docker-manifest-{stream}'
               <<: *manifest-job-settings
             - name: 'functest-benchmarking-docker-manifest-{stream}'
           #!/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 419c4e0..4543f7f 100755 (executable)
@@ -4,41 +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
-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 c328f5d..c70aae3 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
-      - fraser:
+      - gambia:
           branch: 'stable/{stream}'
           disabled: false
 
index 46b77ce..161469b 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
-      - fraser: &fraser
+      - gambia: &gambia
           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 338363c..628b06e 100644 (file)
@@ -8,12 +8,10 @@
     repo: 'opnfv'
     port:
     tag:
-      - latest:
-          branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
 
 - parameter:
     name: functest-kubernetes-slave
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+    name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+    name: 'functest-kubernetes-_-golang-alpine3.9-pull'
     repo: _
     port:
     container: golang
-    tag: alpine3.8
+    tag: alpine3.9
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
 
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-kubernetes-[a-z]+-(daily|check|gate)$'
+            - '^(functest|functest-kubernetes)-[a-z]+-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-rmi'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-alpine3.8-pull'
+            - name: 'functest-kubernetes-_-golang-alpine3.9-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
index e9a65b4..405202e 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
-      - fraser: &fraser
+      - gambia:
           branch: 'stable/{stream}'
-          gs-pathname: '/{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
diff --git a/jjb/functest/functest-weekly-jobs.yaml b/jjb/functest/functest-weekly-jobs.yaml
deleted file mode 100644 (file)
index c88fa00..0000000
+++ /dev/null
@@ -1,128 +0,0 @@
----
-###################################
-# job configuration for functest
-###################################
-- project:
-    name: functest-weekly
-
-    project: functest
-
-    # -------------------------------
-    # BRANCH ANCHORS
-    # -------------------------------
-    master: &master
-      stream: master
-      branch: '{stream}'
-      gs-pathname: ''
-      docker-tag: 'latest'
-      disabled: false
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      gs-pathname: '/{stream}'
-      docker-tag: '{stream}'
-      disabled: false
-    # -------------------------------
-    # POD, INSTALLER, AND BRANCH MAPPING
-    # -------------------------------
-    #    Installers using labels
-    #            CI PODs
-    # This section should only contain the installers
-    # that have been switched using labels for slaves
-    # -------------------------------
-    pod:
-      # fuel CI PODs
-      - baremetal:
-          slave-label: fuel-baremetal
-          installer: fuel
-          <<: *master
-      - virtual:
-          slave-label: fuel-virtual
-          installer: fuel
-          <<: *master
-      - baremetal:
-          slave-label: fuel-baremetal
-          installer: fuel
-          <<: *fraser
-      - virtual:
-          slave-label: fuel-virtual
-          installer: fuel
-          <<: *fraser
-    # -------------------------------
-    jobs:
-      - 'functest-{installer}-{pod}-weekly-{stream}'
-
-################################
-# job template
-################################
-- job-template:
-    name: 'functest-{installer}-{pod}-weekly-{stream}'
-
-    disabled: '{obj:disabled}'
-
-    concurrent: true
-
-    properties:
-      - logrotate-default
-      - throttle:
-          enabled: true
-          max-per-node: 1
-          option: 'project'
-
-    wrappers:
-      - build-name:
-          name: '$BUILD_NUMBER Suite: $FUNCTEST_SUITE_NAME Scenario: $DEPLOY_SCENARIO'
-      - timeout:
-          timeout: '400'
-          abort: true
-
-    parameters:
-      - project-parameter:
-          project: '{project}'
-          branch: '{branch}'
-      - '{installer}-defaults'
-      - '{slave-label}-defaults'
-      - string:
-          name: FUNCTEST_SUITE_NAME
-          default: 'weekly'
-          description: "Weekly suite name to run"
-      - string:
-          name: DEPLOY_SCENARIO
-          default: 'os-odl_l2-nofeature-ha'
-      - string:
-          name: DOCKER_TAG
-          default: '{docker-tag}'
-          description: 'Tag to pull docker image'
-      - string:
-          name: CLEAN_DOCKER_IMAGES
-          default: 'false'
-          description: 'Remove downloaded docker images (opnfv/functest*:*)'
-      - functest-parameter:
-          gs-pathname: '{gs-pathname}'
-
-    scm:
-      - git-scm
-
-    builders:
-      - description-setter:
-          description: "Built on $NODE_NAME"
-      - 'functest-weekly-builder'
-########################
-# builder macros
-########################
-- builder:
-    name: functest-weekly-builder
-    builders:
-      - shell:
-          !include-raw: ./functest-cleanup.sh
-      # yamllint disable rule:indentation
-      - shell:
-          !include-raw:
-              - ./functest-env-presetup.sh
-              - ../../utils/fetch_os_creds.sh
-              - ./functest-alpine.sh
-      # yamllint enable rule:indentation
-      - shell:
-          !include-raw: ../../utils/push-test-logs.sh
-      - shell:
-          !include-raw: ./functest-exit.sh
index 1293915..074ad73 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
           fi
           sudo docker run --rm \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=True \
             -e EXTERNAL_NETWORK=public \
+            -e DEBUG=true \
             -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/python2.7/\
+          site-packages/functest/opnfv_tests/openstack/rally/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
       - vping_userdata
       - cinder_test
       - odl
-      - api_check
-      - snaps_health_check
       - tempest_smoke
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
       - tempest_full
       - tempest_scenario
       - patrole
-      - snaps_smoke
       - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
     triggers:
       - timed: '@daily'
     parameters:
-      - functest-slave
+      - functest-slave:
+          slave: '{slave}'
     properties:
       - build-blocker:
           use-build-blocker: true
           blocking-level: 'NODE'
           blocking-jobs:
-            - '^functest-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
 - 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:
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.8-rmi'
+    name: 'functest-_-alpine-3.9-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
+    slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.8-pull'
+    name: 'functest-_-alpine-3.9-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    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-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
       - 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-[a-z]+-(daily|check|gate)$'
+            - '^functest-{tag}-(daily|check|gate)$'
     builders:
       - multijob:
           name: remove former images
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-rmi'
+            - name: 'functest-_-alpine-3.9-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.8-pull'
+            - name: 'functest-_-alpine-3.9-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-odl-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-api_check-run'
-              <<: *functest-jobs
-            - name: 'functest-opnfv-functest-healthcheck-{tag}-snaps_health_check-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *functest-jobs
       - multijob:
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-snaps_smoke-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron_trunk-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
index 88416bb..4847bbd 100644 (file)
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
-      - gambia:
+      - hunter:
           branch: 'stable/{stream}'
           disabled: false
-      - fraser:
+      - gambia:
           branch: 'stable/{stream}'
           disabled: false
 
index 239ae9f..8307401 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
-      - fraser: &fraser
+      - gambia: &gambia
           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 3f86b05..48c0952 100644 (file)
     tag:
       - latest:
           branch: master
+      - iruya:
+          branch: stable/iruya
       - hunter:
           branch: stable/hunter
-      - gambia:
-          branch: stable/gambia
 
 - parameter:
     name: xtesting-slave
@@ -98,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/ \
           ref: $branch
 
 - project:
-    name: 'xtesting-_-alpine-3.8-rmi'
+    name: 'xtesting-_-alpine-3.9-rmi'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'xtesting-_-alpine-3.8-pull'
+    name: 'xtesting-_-alpine-3.9-pull'
     repo: _
     port:
     container: alpine
-    tag: 3.8
+    tag: 3.9
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
 
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-rmi'
+            - name: 'xtesting-_-alpine-3.9-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-pull'
+            - name: 'xtesting-_-alpine-3.9-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/functest-xtesting
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-rmi'
+            - name: 'xtesting-_-alpine-3.9-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.8-pull'
+            - name: 'xtesting-_-alpine-3.9-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/functest-xtesting
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..c759cf3 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:
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..5b3dae9 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':
     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 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 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 1c622ac..bab3ce9 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
-      - 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
+          <<: *hunter
       - 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
           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
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..a1f47b0
--- /dev/null
@@ -0,0 +1,18 @@
+# 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
+
+branches:
+  - name: stable/hunter
+    location:
+      apex: 8f294ab694a95e60abb29af6f1ef560ae365d436
diff --git a/releases/hunter/availability.yaml b/releases/hunter/availability.yaml
new file mode 100644 (file)
index 0000000..6465400
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: availability
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      availability: 3cbea96d97e2449ed152c38114ec58aa1c876a96
diff --git a/releases/hunter/clover.yaml b/releases/hunter/clover.yaml
new file mode 100644 (file)
index 0000000..1bc9288
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: clover
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      clover: 3f86a3d611f4d2a4f21d9be2a2284ccf120db36e
diff --git a/releases/hunter/doctor.yaml b/releases/hunter/doctor.yaml
new file mode 100644 (file)
index 0000000..ff16aec
--- /dev/null
@@ -0,0 +1,17 @@
+# 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
+
+branches:
+  - name: stable/hunter
+    location:
+      doctor: 73605c5c34b97ab56306bfa9af0f5888f3c7e46d
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..a97b97d
--- /dev/null
@@ -0,0 +1,19 @@
+# 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
+
+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..8538237
--- /dev/null
@@ -0,0 +1,19 @@
+# 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
+
+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/snaps.yaml b/releases/hunter/snaps.yaml
new file mode 100644 (file)
index 0000000..3558ec7
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: snaps
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      snaps: 567cdf25e1319fbc8a1a874dd18d21f88948e67e
diff --git a/releases/hunter/stor4nfv.yaml b/releases/hunter/stor4nfv.yaml
new file mode 100644 (file)
index 0000000..8d7fb22
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: stor4nfv
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      stor4nfv: fe427fc3f69ecc5e104a6fdb2c9f5d82f0254fdb
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..88391b0
--- /dev/null
@@ -0,0 +1,9 @@
+---
+project: yardstick
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      yardstick: 85899baa90714ae15add21a330316793071168ae
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 32c07f8..e5e237d 100755 (executable)
@@ -59,6 +59,9 @@ if [ "$installer_type" == "compass" ]; then
     info "Fetch admin.conf successfully"
 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 -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 "$@"