Merge "Run Doctor apex sample with all test cases"

diff --git a/global-jjb b/global-jjb
index ddd8f4d..5d1ddb5 160000 (submodule)
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit ddd8f4dd3b86b15eb45da9f5f65b16f890b7f60e
+Subproject commit 5d1ddb578a5253fc360a73be6ceea89d65af043e

diff --git a/jjb/apex/apex-rtd-jobs.yaml b/jjb/apex/apex-rtd-jobs.yaml
index 16ae7d9..48e4949 100644 (file)
--- a/jjb/apex/apex-rtd-jobs.yaml
+++ b/jjb/apex/apex-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-apex/47262/'
     rtd-token: '134db049c774ab06c41db432e3a042a982f50edf'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/apex/apex-verify-jobs.yaml b/jjb/apex/apex-verify-jobs.yaml
index 9cccf6d..15e6826 100644 (file)
--- a/jjb/apex/apex-verify-jobs.yaml
+++ b/jjb/apex/apex-verify-jobs.yaml
@@ -373,7 +373,7 @@
               current-parameters: false
               predefined-parameters: |
                 DEPLOY_SCENARIO=$DEPLOY_SCENARIO
-                DOCKER_TAG=""
+                DOCKER_TAG=$DOCKER_TAG
                 FUNCTEST_SUITE_NAME=tempest_smoke
                 FUNCTEST_MODE=testcase
                 GERRIT_BRANCH=$GERRIT_BRANCH

diff --git a/jjb/armband/armband-rtd-jobs.yaml b/jjb/armband/armband-rtd-jobs.yaml
index be3d893..1304008 100644 (file)
--- a/jjb/armband/armband-rtd-jobs.yaml
+++ b/jjb/armband/armband-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-armband/47349/'
     rtd-token: 'b8f7de9a1f2baf063ccc6afb52dbc8e6308b6ab5'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/auto/auto-rtd-jobs.yaml b/jjb/auto/auto-rtd-jobs.yaml
index 1eca3af..f23fe95 100644 (file)
--- a/jjb/auto/auto-rtd-jobs.yaml
+++ b/jjb/auto/auto-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-auto/47350/'
     rtd-token: '3c2277762678c97e59d24c83201194d6b56d7983'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/availability/availability-rtd-jobs.yaml b/jjb/availability/availability-rtd-jobs.yaml
index d63bb9e..e245e59 100644 (file)
--- a/jjb/availability/availability-rtd-jobs.yaml
+++ b/jjb/availability/availability-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-availability/47351/'
     rtd-token: '3ae514b14073e1eacb697d3eddee62a26c8c891c'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml
index 1b647db..936d1f2 100644 (file)
--- a/jjb/barometer/barometer-rtd-jobs.yaml
+++ b/jjb/barometer/barometer-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-barometer/47353/'
     rtd-token: 'aef70b8a0148b295e25dd92474110bcd622bacb0'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index 972848f..9cb222a 100644 (file)
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -32,7 +32,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'ericsson-build4-defaults'
+      - 'lf-build2-defaults'
 
     scm:
       - git-scm-gerrit
@@ -89,7 +89,7 @@
       - project-parameter:
           project: '{project}'
           branch: '{branch}'
-      - 'ericsson-build4-defaults'
+      - 'lf-build2-defaults'
 
     scm:
       - git-scm

diff --git a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml
index 27b883b..9730f24 100644 (file)
--- a/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml
+++ b/jjb/bottlenecks/bottlenecks-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-bottlenecks/47355/'
     rtd-token: '95dd0dbdde4a219b5196ffb86e15401b7b927885'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml
index 974ec6e..7d13688 100644 (file)
--- a/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml
+++ b/jjb/compass4nfv/compass4nfv-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-compass4nfv/47358/'
     rtd-token: '4208e8492be2e4eab7f18f1e70b5d78247d1b249'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/container4nfv/container4nfv-arm64.yaml b/jjb/container4nfv/container4nfv-arm64.yaml
index 5425ae0..c5ba3be 100644 (file)
--- a/jjb/container4nfv/container4nfv-arm64.yaml
+++ b/jjb/container4nfv/container4nfv-arm64.yaml
@@ -7,8 +7,8 @@
     stream:
       - master:
           branch: master
-      - fraser:
-          branch: stable/fraser
+      - gambia:
+          branch: stable/gambia
     scenario:
       - 'k8-multus-nofeature-noha':
           disabled: false
@@ -120,7 +120,7 @@
     triggers:
       - timed: '0 12 * * *'
 - trigger:
-    name: 'trigger-deploy-virtual-fraser'
+    name: 'trigger-deploy-virtual-gambia'
     triggers:
       - timed: '0 18 * * *'
 - trigger:
@@ -128,6 +128,6 @@
     triggers:
       - timed: '0 12 * * *'
 - trigger:
-    name: 'trigger-deploy-baremetal-fraser'
+    name: 'trigger-deploy-baremetal-gambia'
     triggers:
       - timed: '0 18 * * *'

diff --git a/jjb/container4nfv/container4nfv-project.yaml b/jjb/container4nfv/container4nfv-project.yaml
index ae9b436..f1d58da 100644 (file)
--- a/jjb/container4nfv/container4nfv-project.yaml
+++ b/jjb/container4nfv/container4nfv-project.yaml
@@ -18,7 +18,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser: &fraser
+      - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/container4nfv/container4nfv-rtd-jobs.yaml b/jjb/container4nfv/container4nfv-rtd-jobs.yaml
index 0a008b4..b55f958 100644 (file)
--- a/jjb/container4nfv/container4nfv-rtd-jobs.yaml
+++ b/jjb/container4nfv/container4nfv-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-container4nfv/47359/'
     rtd-token: '82f917a788d006dc15df14ecd3c991115490bf8a'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/daisy4nfv/daisy-rtd-jobs.yaml b/jjb/daisy4nfv/daisy-rtd-jobs.yaml
index 59c66a9..2e7689a 100644 (file)
--- a/jjb/daisy4nfv/daisy-rtd-jobs.yaml
+++ b/jjb/daisy4nfv/daisy-rtd-jobs.yaml
@@ -4,7 +4,6 @@
     project: daisy
     project-name: daisy
 
-    gerrit-skip-vote: true
     project-pattern: 'daisy'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-daisy/47361/'
     rtd-token: '265efe14ff0bb3fa0d4ea66d6be1b7b511d5d713'

diff --git a/jjb/doctor/doctor-rtd-jobs.yaml b/jjb/doctor/doctor-rtd-jobs.yaml
index 1693a6f..13ff860 100644 (file)
--- a/jjb/doctor/doctor-rtd-jobs.yaml
+++ b/jjb/doctor/doctor-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-doctor/47362/'
     rtd-token: 'bf8640556a3ba3151e4e5602facc5ed982dd88c8'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/dovetail/dovetail-ci-jobs.yaml b/jjb/dovetail/dovetail-ci-jobs.yaml
index 02a33cc..abbffb2 100644 (file)
--- a/jjb/dovetail/dovetail-ci-jobs.yaml
+++ b/jjb/dovetail/dovetail-ci-jobs.yaml
@@ -20,6 +20,7 @@
       dovetail-branch: '{stream}'
       gs-pathname: ''
       docker-tag: 'latest'
+      disabled: true
     fraser: &fraser
       stream: fraser
       branch: 'stable/{stream}'
@@ -66,6 +67,16 @@
           SUT: fuel
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *fraser
+      - baremetal:
+          slave-label: fuel-baremetal
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
+      - virtual:
+          slave-label: fuel-virtual
+          SUT: fuel
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
       # compass CI PODs
       - baremetal:
           slave-label: compass-baremetal
@@ -124,6 +135,16 @@
           SUT: apex
           auto-trigger-name: 'daily-trigger-disabled'
           <<: *fraser
+      - virtual:
+          slave-label: apex-virtual-master
+          SUT: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
+      - baremetal:
+          slave-label: apex-baremetal-master
+          SUT: apex
+          auto-trigger-name: 'daily-trigger-disabled'
+          <<: *gambia
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal

diff --git a/jjb/edgecloud/edgecloud-rtd-jobs.yaml b/jjb/edgecloud/edgecloud-rtd-jobs.yaml
new file mode 100644 (file)
index 0000000..a3835f3
--- /dev/null
+++ b/jjb/edgecloud/edgecloud-rtd-jobs.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: edgecloud-rtd
+    project: edgecloud
+    project-name: edgecloud
+
+    project-pattern: 'edgecloud'
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-edgecloud/52895/'
+    rtd-token: '47989bec8e8da44ab2f33491cd6031f0411d319b'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
+    jobs:
+      - '{project-name}-rtd-jobs'

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 936187c..fb619c3 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -75,6 +75,8 @@
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-sfc-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
+      - 'os-odl-bgpvpn-noha':
+          auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-ovn-nofeature-noha':
           auto-trigger-name: 'fuel-{scenario}-{pod}-daily-{stream}-trigger'
       - 'os-odl-ovs-noha':
@@ -92,6 +94,8 @@
         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
@@ -202,7 +206,7 @@
       # 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
+      # 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
@@ -210,9 +214,6 @@
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
           steps:
             - trigger-builds:
                 - project: 'dovetail-fuel-{pod}-default-mandatory-{stream}'
@@ -231,9 +232,12 @@
             - condition-kind: regex-match
               regex: '.*-ha'
               label: '{scenario}'
-            - condition-kind: regex-match
-              regex: 'fraser'
-              label: '{stream}'
+            - 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}'
@@ -393,6 +397,10 @@
     name: 'fuel-os-odl-sfc-noha-baremetal-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-master-trigger'
     triggers:
@@ -446,6 +454,10 @@
     name: 'fuel-os-odl-sfc-noha-baremetal-daily-gambia-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-gambia-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-gambia-trigger'
     triggers:
@@ -498,6 +510,10 @@
     name: 'fuel-os-odl-sfc-noha-virtual-daily-master-trigger'
     triggers:
       - timed: '5 4 * * *'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-master-trigger'
+    triggers:
+      - timed: '5 6 * * *'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-master-trigger'
     triggers:
@@ -565,6 +581,10 @@
     name: 'fuel-os-odl-sfc-noha-virtual-daily-gambia-trigger'
     triggers:
       - timed: '0 4 * * *'
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-gambia-trigger'
+    triggers:
+      - timed: '0 7 * * *'
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-virtual-daily-gambia-trigger'
     triggers:
@@ -617,6 +637,10 @@
     name: 'fuel-os-odl-sfc-noha-zte-pod1-daily-master-trigger'
     triggers:
       - timed: ''
+- trigger:
+    name: 'fuel-os-odl-bgpvpn-noha-zte-pod1-daily-master-trigger'
+    triggers:
+      - timed: ''
 - trigger:
     name: 'fuel-os-ovn-nofeature-noha-zte-pod1-daily-master-trigger'
     triggers:

diff --git a/jjb/fuel/fuel-project-jobs.yaml b/jjb/fuel/fuel-project-jobs.yaml
deleted file mode 100644 (file)
index f424c20..0000000
--- a/jjb/fuel/fuel-project-jobs.yaml
+++ /dev/null
@@ -1,20 +0,0 @@
----
-########################
-# Job configuration for fuel
-########################
-- project:
-    name: fuel-project-jobs
-
-    project: 'fuel'
-
-    installer: 'fuel'
-
-    stream:
-      - master:
-          branch: '{stream}'
-          gs-pathname: ''
-          disabled: false
-      - gambia:
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false

diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml
new file mode 100644 (file)
index 0000000..d40ef98
--- /dev/null
+++ b/jjb/fuel/fuel-rtd-jobs.yaml
@@ -0,0 +1,20 @@
+---
+- project:
+    name: fuel-rtd
+    project: fuel
+    project-name: fuel
+
+    project-pattern: 'fuel'
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-fuel/47205/'
+    rtd-token: '38f40bf6c08fd4bccb930871bc29b08404cf98b0'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
+    jobs:
+      - '{project-name}-rtd-jobs'

diff --git a/jjb/functest/functest-rtd-jobs.yaml b/jjb/functest/functest-rtd-jobs.yaml
index e453382..785bd35 100644 (file)
--- a/jjb/functest/functest-rtd-jobs.yaml
+++ b/jjb/functest/functest-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-functest/47369/'
     rtd-token: '26f9131bd5c337928ba8b431a289f6850b330504'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/global/slave-params.yaml b/jjb/global/slave-params.yaml
index 09a0d22..1d8654c 100644 (file)
--- a/jjb/global/slave-params.yaml
+++ b/jjb/global/slave-params.yaml
@@ -603,6 +603,24 @@
           default: $WORKSPACE/build_output
           description: "Directory where the build artifact will be located upon the completion of the build."
 
+- parameter:
+    name: 'lf-build2-defaults'
+    parameters:
+      - label:
+          name: SLAVE_LABEL
+          default: 'lf-build2'
+          description: 'Slave label on Jenkins'
+          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: BUILD_DIRECTORY
+          default: $WORKSPACE/build_output
+          description: "Directory where the build artifact will be located upon the completion of the build."
+
 - parameter:
     name: 'ericsson-build3-defaults'
     parameters:

diff --git a/jjb/ipv6/ipv6-rtd-jobs.yaml b/jjb/ipv6/ipv6-rtd-jobs.yaml
index 7a677ce..edaa1c3 100644 (file)
--- a/jjb/ipv6/ipv6-rtd-jobs.yaml
+++ b/jjb/ipv6/ipv6-rtd-jobs.yaml
@@ -4,10 +4,17 @@
     project: ipv6
     project-name: ipv6
 
-    gerrit-skip-vote: true
     project-pattern: 'ipv6'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ipv6/47370/'
     rtd-token: 'e7abb4e2c3f3f0dfc1a8feefe39b27f4a4f9b98a'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/nfvbench/nfvbench-rtd-jobs.yaml b/jjb/nfvbench/nfvbench-rtd-jobs.yaml
index 56fda70..5ff9483 100644 (file)
--- a/jjb/nfvbench/nfvbench-rtd-jobs.yaml
+++ b/jjb/nfvbench/nfvbench-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-nfvbench/47376/'
     rtd-token: '7d77b15615ffe7906f1f20e245c80dc0a0f97e47'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/nfvbench/nfvbench.yaml b/jjb/nfvbench/nfvbench.yaml
index 44e85d2..ec6776f 100644 (file)
--- a/jjb/nfvbench/nfvbench.yaml
+++ b/jjb/nfvbench/nfvbench.yaml
@@ -14,7 +14,7 @@
           gs-pathname: ''
           docker-tag: 'latest'
           disabled: false
-      - fraser: &fraser
+      - gambia:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           docker-tag: 'stable'

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index b4b85f6..a8d29e4 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -79,29 +79,11 @@
     triggers:
       - gerrit-trigger-patchset-created:
           server: 'gerrit.opnfv.org'
-          project: '**'
+          project: 'opnfvdocs'
           branch: '{branch}'
           files: 'docs/**'
 
     builders:
-      - shell: |
-          if [ "$GERRIT_PROJECT" != "opnfvdocs" ]; then
-              # Temporary hacky solution to handle local builds for projects
-              # that already moved away from submodules
-              if ! cd docs/submodules/$GERRIT_PROJECT 2 > /dev/null; then
-                  rm -rf .* * 2 > /dev/null
-                  git clone ${{GIT_BASE/opnfvdocs/$GERRIT_PROJECT}} .
-              fi
-              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-              cd -
-          else
-              git fetch origin $GERRIT_REFSPEC && git checkout FETCH_HEAD
-          fi
-          if [ -d docs/subdmodules ]; then
-              for project in docs/submodules/*; do
-                  cd $project && git submodule deinit -f . && cd -
-              done
-          fi
       - shell: |
           sudo -H pip install virtualenv
           virtualenv $WORKSPACE/venv

diff --git a/jjb/orchestra/orchestra-daily-jobs.yaml b/jjb/orchestra/orchestra-daily-jobs.yaml
index 7c2deae..94f9d8b 100644 (file)
--- a/jjb/orchestra/orchestra-daily-jobs.yaml
+++ b/jjb/orchestra/orchestra-daily-jobs.yaml
@@ -14,7 +14,7 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-      disabled: false
+      disabled: true
 
     # ------------------------------------------------------
     # POD, INSTALLER, AND BRANCH MAPPING

diff --git a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml
index ca4cfee..034d6d6 100644 (file)
--- a/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml
+++ b/jjb/ovn4nfv/ovn4nfv-daily-jobs.yaml
@@ -8,7 +8,7 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-      disabled: false
+      disabled: true
 
     pod:
       - virtual:

diff --git a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
index 3169f33..984ec4f 100644 (file)
--- a/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
+++ b/jjb/ovn4nfv/ovn4nfv-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-ovn4nfv/47381/'
     rtd-token: 'f131200fd878a5c443f18c134c3bfda122538bce'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/pharos/pharos-tools.yml b/jjb/pharos/pharos-tools.yml
index 507e93e..ac5d195 100644 (file)
--- a/jjb/pharos/pharos-tools.yml
+++ b/jjb/pharos/pharos-tools.yml
@@ -44,10 +44,7 @@
       - gerrit-trigger-change-merged:
           branch: 'master'
           project: '{project}'
-          # In the future this should be switch to just the compose file
-          # for when tags are updated
-          #   files: 'dashboard/docker-compose.yml'
-          files: 'dashboard/**'
+          files: 'dashboard/docker-compose.yml'
 
     builders:
       - shell:

diff --git a/jjb/pharos/shell/deploy-dashboard.sh b/jjb/pharos/shell/deploy-dashboard.sh
index 4ca41f4..46a79c3 100644 (file)
--- a/jjb/pharos/shell/deploy-dashboard.sh
+++ b/jjb/pharos/shell/deploy-dashboard.sh
@@ -7,11 +7,13 @@
 # which accompanies this distribution, and is available at
 # http://www.apache.org/licenses/LICENSE-2.0
 ##############################################################################
-
 cp $HOME/config.env $WORKSPACE/dashboard
-cp $HOME/rsa.pub $WORKSPACE/dashboard
-cp $HOME/rsa.pem $WORKSPACE/dashboard
-
 cd $WORKSPACE/dashboard
+
 docker-compose pull
 docker-compose up -d
+
+# Copy JIRA keys into web container
+WEB_CONTAINER="$(docker ps --filter 'name=dg01' -q)"
+docker cp $HOME/rsa.pub $WEB_CONTAINER:/pharos_dashboard/account/
+docker cp $HOME/rsa.pem $WEB_CONTAINER:/pharos_dashboard/account/

diff --git a/jjb/promise/promise-rtd-jobs.yaml b/jjb/promise/promise-rtd-jobs.yaml
index 427e741..a547ac0 100644 (file)
--- a/jjb/promise/promise-rtd-jobs.yaml
+++ b/jjb/promise/promise-rtd-jobs.yaml
@@ -4,7 +4,6 @@
     project: promise
     project-name: promise
 
-    gerrit-skip-vote: true
     project-pattern: 'promise'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-promise/47386/'
     rtd-token: 'e689330ddc9401d83dd26efbe26a55a6ecd33a0d'

diff --git a/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml
index f5cc819..a01544f 100644 (file)
--- a/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml
+++ b/jjb/sdnvpn/sdnvpn-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sdnvpn/47391/'
     rtd-token: '1efdc48a9819be55a28137937674f1f744d02fe0'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/sfc/sfc-project-jobs.yaml b/jjb/sfc/sfc-project-jobs.yaml
index f8ceef7..31f7aa6 100644 (file)
--- a/jjb/sfc/sfc-project-jobs.yaml
+++ b/jjb/sfc/sfc-project-jobs.yaml
@@ -77,6 +77,10 @@
     name: sfc-unit-tests-and-docs
     builders:
       - shell: |
+          #!/bin/bash
+          virtualenv /var/tmp/sfc
+          source /var/tmp/sfc/bin/activate
+          pip install tox
           cd $WORKSPACE && tox
 
 ################################

diff --git a/jjb/sfc/sfc-rtd-jobs.yaml b/jjb/sfc/sfc-rtd-jobs.yaml
index 42b2004..f7d4c9b 100644 (file)
--- a/jjb/sfc/sfc-rtd-jobs.yaml
+++ b/jjb/sfc/sfc-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-sfc/47392/'
     rtd-token: 'bc4419f4dded5c816071b042ac32c03ac6108700'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
index ff6814c..0e03e7b 100644 (file)
--- a/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
+++ b/jjb/stor4nfv/stor4nfv-rtd-jobs.yaml
@@ -4,10 +4,17 @@
     project: stor4nfv
     project-name: stor4nfv
 
-    gerrit-skip-vote: true
     project-pattern: 'stor4nfv'
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-stor4nfv/47394/'
     rtd-token: '9c189b44cf08de75dc06253558cc86ed93982cbb'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
index 01b8cdf..9981240 100644 (file)
--- a/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
+++ b/jjb/vswitchperf/vswitchperf-rtd-jobs.yaml
@@ -9,5 +9,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-vswitchperf/47398/'
     rtd-token: '47bbe5675e6cc5a6207fcc9b4db8dac03c27d9de'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/jjb/vswitchperf/vswitchperf.yaml b/jjb/vswitchperf/vswitchperf.yaml
index 569b115..9e987fe 100644 (file)
--- a/jjb/vswitchperf/vswitchperf.yaml
+++ b/jjb/vswitchperf/vswitchperf.yaml
@@ -15,7 +15,11 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - fraser: &fraser
+      - gambia: &gambia
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - fraser:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/xci/xci-daily-jobs.yaml b/jjb/xci/xci-daily-jobs.yaml
index 18b20f2..66cbb83 100644 (file)
--- a/jjb/xci/xci-daily-jobs.yaml
+++ b/jjb/xci/xci-daily-jobs.yaml
@@ -341,9 +341,7 @@
               declare -x "\${var}" 2>/dev/null
               echo $var
           done < ${XCI_PATH}/.cache/xci.env && cd ${XCI_PATH}/xci && \
-          ansible-playbook -i playbooks/dynamic_inventory.py \
-          -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \
-          playbooks/prepare-tests.yml
+          ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml
           ssh root@192.168.122.2 "/root/prepare-tests.sh"
           echo "---------------------------------------------------------------------------------"
 

diff --git a/jjb/xci/xci-run-functest.sh b/jjb/xci/xci-run-functest.sh
index 610268c..992194c 100755 (executable)
--- a/jjb/xci/xci-run-functest.sh
+++ b/jjb/xci/xci-run-functest.sh
@@ -49,9 +49,7 @@ export XCI_VENV=${XCI_PATH}/venv
 
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm "source $XCI_VENV/bin/activate; \
     while read var; do declare -x \"\${var}\" 2>/dev/null; done < ${XCI_PATH}/.cache/xci.env && \
-    cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py \
-    -i ${XCI_PATH}/.cache/repos/openstack-ansible/inventory/dynamic_inventory.py \
-    playbooks/prepare-tests.yml"
+    cd releng-xci/xci && ansible-playbook -i playbooks/dynamic_inventory.py playbooks/prepare-tests.yml"
 echo "Prepare OPNFV VM for Tests"
 ssh -F $HOME/.ssh/${DISTRO}-xci-vm-config ${DISTRO}_xci_vm_opnfv "/root/prepare-tests.sh"
 echo "Running Functest"

diff --git a/jjb/yardstick/yardstick-rtd-jobs.yaml b/jjb/yardstick/yardstick-rtd-jobs.yaml
index 88574f0..a18a655 100644 (file)
--- a/jjb/yardstick/yardstick-rtd-jobs.yaml
+++ b/jjb/yardstick/yardstick-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-yardstick/47399/'
     rtd-token: '6aa883824f3917c7db5ffa1fe9168817fb5feb68'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - gambia:
+          branch: 'stable/{stream}'
+          disabled: false
+
     jobs:
       - '{project-name}-rtd-jobs'

diff --git a/releases/gambia/armband.yaml b/releases/gambia/armband.yaml
index 0790de1..2e5f65a 100644 (file)
--- a/releases/gambia/armband.yaml
+++ b/releases/gambia/armband.yaml
@@ -11,7 +11,14 @@ project: armband
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-7.0.0
+    location:
+      armband: 30027365166c204bc03043234bbc6b0dfc2506fb
+
 branches:
   - name: stable/gambia
     location:
       armband: a880b5c0fe55397b73f0fcf8f8c87d523327099d
+
+release-notes: https://opnfv-armband.readthedocs.io/en/latest/release/release-notes/release-notes.html

diff --git a/releases/gambia/availability.yaml b/releases/gambia/availability.yaml
new file mode 100644 (file)
index 0000000..ee28fec
--- /dev/null
+++ b/releases/gambia/availability.yaml
@@ -0,0 +1,9 @@
+---
+project: availability
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      availability: 053a75d02fe1842ba3e2bc0d6b019e1cdc6a6123

diff --git a/releases/gambia/container4nfv.yaml b/releases/gambia/container4nfv.yaml
new file mode 100644 (file)
index 0000000..6522cfa
--- /dev/null
+++ b/releases/gambia/container4nfv.yaml
@@ -0,0 +1,9 @@
+---
+project: container4nfv
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      container4nfv: 1fa07ef952a6b0e12487901919cec52b9d9b9739

diff --git a/releases/gambia/doctor.yaml b/releases/gambia/doctor.yaml
index 3294fec..3bf86a4 100644 (file)
--- a/releases/gambia/doctor.yaml
+++ b/releases/gambia/doctor.yaml
@@ -15,6 +15,9 @@ releases:
   - version: opnfv-7.0.0
     location:
       doctor: 3ddc2392b0ed364eede49ff006d64df3ea456350
+  - version: opnfv-7.0.1
+    location:
+      doctor: 9250be9b9f3e3fff0c5aa827daf89f0212ce964f
 
 branches:
   - name: stable/gambia

diff --git a/releases/gambia/edgecloud.yaml b/releases/gambia/edgecloud.yaml
new file mode 100644 (file)
index 0000000..db80383
--- /dev/null
+++ b/releases/gambia/edgecloud.yaml
@@ -0,0 +1,9 @@
+---
+project: edgecloud
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      edgecloud: 3708debe3f7ff9edd0f0a52998ebf7a799bb712f

diff --git a/releases/gambia/fuel.yaml b/releases/gambia/fuel.yaml
index 8c86010..a958209 100644 (file)
--- a/releases/gambia/fuel.yaml
+++ b/releases/gambia/fuel.yaml
@@ -15,3 +15,10 @@ branches:
   - name: stable/gambia
     location:
       fuel: 90a442136b0aff8380388ac0a94831d0904e3cb8
+
+releases:
+  - version: opnfv-7.0.0
+    location:
+      fuel: 326c26b9b89c23e9775ba287d9da3bea35cfc437
+
+release-notes: https://opnfv-fuel.readthedocs.io/en/latest/release/release-notes/release-notes.html

diff --git a/releases/gambia/nfvbench.yaml b/releases/gambia/nfvbench.yaml
new file mode 100644 (file)
index 0000000..796ec4d
--- /dev/null
+++ b/releases/gambia/nfvbench.yaml
@@ -0,0 +1,9 @@
+---
+project: nfvbench
+project-type: tools
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      nfvbench: 3dfb5268ebfada08c1a2316708564e627f86da42

diff --git a/releases/gambia/sfc.yaml b/releases/gambia/sfc.yaml
index 14152d3..c32b9c8 100644 (file)
--- a/releases/gambia/sfc.yaml
+++ b/releases/gambia/sfc.yaml
@@ -7,3 +7,5 @@ branches:
   - name: stable/gambia
     location:
       sfc: 77bdb6a79a506f91959070dc8ff28949f2dff825
+
+release-notes: https://opnfv-sfc.readthedocs.io/en/stable-gambia/release/release-notes/

diff --git a/releases/gambia/vswitchperf.yaml b/releases/gambia/vswitchperf.yaml
new file mode 100644 (file)
index 0000000..8daa55e
--- /dev/null
+++ b/releases/gambia/vswitchperf.yaml
@@ -0,0 +1,9 @@
+---
+project: vswitchperf
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/gambia
+    location:
+      vswitchperf: 96de8654952a606d28d56c057ba871b5553e4176

diff --git a/releases/gambia/yardstick.yaml b/releases/gambia/yardstick.yaml
index 3c782c4..2dc5ad6 100644 (file)
--- a/releases/gambia/yardstick.yaml
+++ b/releases/gambia/yardstick.yaml
@@ -7,3 +7,10 @@ branches:
   - name: stable/gambia
     location:
       yardstick: 497292013ef0d7e1e014d76803d4f284618b4986
+
+releases:
+  - version: opnfv-7.0.0
+    location:
+      yardstick: b9fa3eac6caf65a371f339fcbc3abc7cbe5b41cc
+
+release-notes: https://opnfv-yardstick.readthedocs.io/en/stable-gambia/release/release-notes/

diff --git a/utils/build-server-ansible/vars/CentOS.yml b/utils/build-server-ansible/vars/CentOS.yml
index 7a2c1d1..50839be 100644 (file)
--- a/utils/build-server-ansible/vars/CentOS.yml
+++ b/utils/build-server-ansible/vars/CentOS.yml
@@ -29,24 +29,25 @@
     name: "{{ item }}"
     state: present
   with_items:
-    - python-pip
-    - rpm-build
+    - bc
+    - collectd
+    - doxygen
+    - facter
+    - jq
     - kernel-headers
     - libpcap-devel
-    - zlib-devel
-    - numactl-devel
-    - doxygen
-    - python-sphinx
     - libvirt-devel
-    - python-devel
+    - net-tools
+    - numactl-devel
     - openssl-devel
+    - python-devel
+    - python-pip
     - python-six
-    - net-tools
-    - bc
+    - python-sphinx
+    - rpm-build
     - sysstat
     - xmlstarlet
-    - facter
-    - jq
+    - zlib-devel
 
 - name: install the 'Development tools' package group
   yum: