Merge "VNFM with ETSI FEAT03 changes"

diff --git a/jjb/airship/airship-rtd-jobs.yaml b/jjb/airship/airship-rtd-jobs.yaml
new file mode 100644 (file)
index 0000000..f3af2ad
--- /dev/null
+++ b/jjb/airship/airship-rtd-jobs.yaml
@@ -0,0 +1,21 @@
+---
+- project:
+    name: airship-rtd
+    project: airship
+    project-name: airship
+    project-pattern: 'airship'
+
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - iruya:
+          branch: 'stable/{stream}'
+          disabled: false
+
+
+    rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-airship/111032/'
+    rtd-token: 'b4e9b47eee6e1311e82e462f06cc4fb44a7534db'
+
+    jobs:
+      - '{project-name}-rtd-jobs'

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 0f903af..0767159 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -81,8 +81,8 @@
           fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/airship/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e NODE_NAME=$slave \
@@ -97,6 +97,8 @@
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
             -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python2.7/\
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
+            -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python2.7/\
+          site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
             $image run_tests -t {test} -r -p
 
 - builder:
@@ -323,6 +325,46 @@
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
+- builder:
+    name: airship-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{functest_tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{functest_tag}
+          else
+            image={repo}:{port}/{container}:{functest_tag}
+          fi
+          sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/airship \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/ \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'airship-{tag}-zip'
+    parameters:
+      - airship-build_tag:
+          build_tag: ''
+    builders:
+      - airship-zip:
+          <<: *airship-containers
+
+- project:
+    name: 'airship-{tag}-zip'
+    <<: *airship-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'airship-{tag}-zip'
+
 - job-template:
     name: 'airship-{tag}-daily'
     project-type: multijob
@@ -458,6 +500,11 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *airship-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'airship-{tag}-zip'
+              <<: *airship-jobs
 
 - trigger:
     name: airship-patchset-created
@@ -583,10 +630,6 @@
           projects:
             - name: 'airship-opnfv-functest-vnf-{tag}-cloudify-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-cloudify_ims-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-heat_ims-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index c2abc81..acdcb2a 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -10,7 +10,7 @@
     tag:
       - latest:
           branch: master
-          slave: intel-pod10
+          slave: intel-pod15
           functest_tag: hunter
 
 - parameter:
@@ -81,8 +81,8 @@
           fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/cntt/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e NODE_NAME=$slave \
@@ -352,6 +352,46 @@
     jobs:
       - 'cntt-{repo}-{container}-{tag}-{test}-run'
 
+- builder:
+    name: cntt-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{functest_tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{functest_tag}
+          else
+            image={repo}:{port}/{container}:{functest_tag}
+          fi
+          sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/airship \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/ \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'cntt-{tag}-zip'
+    parameters:
+      - cntt-build_tag:
+          build_tag: ''
+    builders:
+      - cntt-zip:
+          <<: *cntt-containers
+
+- project:
+    name: 'cntt-{tag}-zip'
+    <<: *cntt-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'cntt-{tag}-zip'
+
 - job-template:
     name: 'cntt-{tag}-daily'
     project-type: multijob
@@ -509,6 +549,11 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *cntt-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'cntt-{tag}-zip'
+              <<: *cntt-jobs
 
 - trigger:
     name: cntt-patchset-created
@@ -536,7 +581,6 @@
 - job-template:
     name: 'cntt-{tag}-gate'
     project-type: multijob
-    disabled: true
     triggers:
       - cntt-patchset-created:
           branch: '{branch}'

diff --git a/jjb/armband/armband-ci-jobs.yaml b/jjb/armband/armband-ci-jobs.yaml
index 0e99cfb..4f2dc5e 100644 (file)
--- a/jjb/armband/armband-ci-jobs.yaml
+++ b/jjb/armband/armband-ci-jobs.yaml
@@ -12,7 +12,7 @@
       stream: master
       branch: '{stream}'
       gs-pathname: ''
-      disabled: false
+      disabled: true
       functest_docker_tag: hunter
     hunter: &hunter
       stream: hunter

diff --git a/jjb/barometer/barometer-rtd-jobs.yaml b/jjb/barometer/barometer-rtd-jobs.yaml
index 1156772..a8ec686 100644 (file)
--- a/jjb/barometer/barometer-rtd-jobs.yaml
+++ b/jjb/barometer/barometer-rtd-jobs.yaml
@@ -12,7 +12,11 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter: &hunter
+      - iruya: &iruya
+          branch: 'stable/{stream}'
+          gs-pathname: '/{stream}'
+          disabled: false
+      - hunter:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/barometer/barometer.yaml b/jjb/barometer/barometer.yaml
index 6bc904e..5ebab5a 100644 (file)
--- a/jjb/barometer/barometer.yaml
+++ b/jjb/barometer/barometer.yaml
@@ -18,11 +18,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - hunter: &hunter
-          branch: 'stable/{stream}'
-          gs-pathname: '/{stream}'
-          disabled: false
-      - gambia:
+      - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/calipso/calipso.yaml b/jjb/calipso/calipso.yaml
index 6701e7c..7ecabdf 100644 (file)
--- a/jjb/calipso/calipso.yaml
+++ b/jjb/calipso/calipso.yaml
@@ -62,4 +62,4 @@
           set -o nounset
           set -o pipefail
           cd $WORKSPACE
-          PYTHONPATH=$PWD/app app/test/verify.sh
+          PYTHONPATH=$PWD api/test/verify.sh

diff --git a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
index 649538e..1f75829 100644 (file)
--- a/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
+++ b/jjb/ci_gate_security/opnfv-ci-gate-security.yaml
@@ -22,7 +22,6 @@
       - bottlenecks
       - calipso
       - clover
-      - conductor
       - container4nfv
       - cperf
       - daisy
@@ -48,7 +47,6 @@
       - ovsnfv
       - parser
       - pharos
-      - promise
       - qtip
       - releng
       - releng-anteater
@@ -149,7 +147,7 @@
                 comment-contains-value: 'recheck'
           projects:
             - project-compare-type: 'REG_EXP'
-              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|conductor|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon'
+              project-pattern: 'apex|armband|bamboo|barometer|bottlenecks|calipso|cperf|daisy|doctor|dovetail|dpacc|enfv|fds|fuel|pharos|releng|sandbox|yardstick|infra|ipv6|kvmfornfv|models|moon'
               branches:
                 - branch-compare-type: 'ANT'
                   branch-pattern: '**/{branch}'

diff --git a/jjb/conductor/conductor.yaml b/jjb/conductor/conductor.yaml
deleted file mode 100644 (file)
index 8a128da..0000000
--- a/jjb/conductor/conductor.yaml
+++ /dev/null
@@ -1,8 +0,0 @@
----
-- project:
-    name: conductor
-
-    project: '{name}'
-
-    jobs:
-      - '{project}-verify-basic'

diff --git a/jjb/dovetail/dovetail-project-jobs.yaml b/jjb/dovetail/dovetail-project-jobs.yaml
index 1accffc..2e9652e 100644 (file)
--- a/jjb/dovetail/dovetail-project-jobs.yaml
+++ b/jjb/dovetail/dovetail-project-jobs.yaml
@@ -16,7 +16,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - danube:
+      - hunter:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/dovetail/dovetail-rtd-jobs.yaml b/jjb/dovetail/dovetail-rtd-jobs.yaml
index 482ff46..395c75a 100644 (file)
--- a/jjb/dovetail/dovetail-rtd-jobs.yaml
+++ b/jjb/dovetail/dovetail-rtd-jobs.yaml
@@ -8,5 +8,13 @@
     rtd-build-url: 'https://readthedocs.org/api/v2/webhook/opnfv-dovetail/47364/'
     rtd-token: '47df9d7358b153666c2cf5cc139cd3a65d135688'
 
+    stream:
+      - master:
+          branch: '{stream}'
+          disabled: false
+      - hunter:
+          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 9a8d809..5a63d09 100644 (file)
--- a/jjb/fuel/fuel-daily-jobs.yaml
+++ b/jjb/fuel/fuel-daily-jobs.yaml
@@ -17,8 +17,8 @@
       disabled: false
       gs-pathname: ''
       functest_docker_tag: iruya
-    hunter: &hunter
-      stream: hunter
+    iruya: &iruya
+      stream: iruya
       branch: 'stable/{stream}'
       disabled: false
       gs-pathname: '/{stream}'
@@ -37,10 +37,10 @@
           <<: *master
       - baremetal:
           slave-label: fuel-baremetal
-          <<: *hunter
+          <<: *iruya
       - virtual:
           slave-label: fuel-virtual
-          <<: *hunter
+          <<: *iruya
       # -------------------------------
       #        None-CI PODs
       # -------------------------------
@@ -403,64 +403,64 @@
     triggers:
       - timed: ''
 # ----------------------------------------------
-# Triggers for job running on fuel-baremetal against hunter branch
+# Triggers for job running on fuel-baremetal against iruya branch
 # ----------------------------------------------
 # HA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 1,4,7'
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 5 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-sfc-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-sfc-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-bgpvpn-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 6'
 - trigger:
-    name: 'fuel-os-odl-ovs-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-odl-ovs-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 2'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: '0 20 * * 3,5'
 - trigger:
-    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-hunter-trigger'
+    name: 'fuel-k8-calico-nofeature-noha-baremetal-daily-iruya-trigger'
     triggers:
       - timed: ''
 # ----------------------------------------------
@@ -518,69 +518,69 @@
 - trigger:
     name: 'fuel-os-nosdn-fdio-noha-virtual-daily-master-trigger'
     triggers:
-      - timed: ''
+      - timed: '5 20 * * *'
 - trigger:
     name: 'fuel-k8-calico-nofeature-noha-virtual-daily-master-trigger'
     triggers:
       - timed: '5 16 * * *'
 # ----------------------------------------------
-# Triggers for job running on fuel-virtual against hunter branch
+# Triggers for job running on fuel-virtual against iruya branch
 # ----------------------------------------------
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-odl-nofeature-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 - trigger:
-    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-ha-virtual-daily-iruya-trigger'
     triggers:
       - timed: ''
 # NOHA Scenarios
 - trigger:
-    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 13 * * *'
 - trigger:
-    name: 'fuel-os-odl-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 18 * * *'
 - trigger:
-    name: 'fuel-os-odl-sfc-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-sfc-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 4 * * 1,4'
 - trigger:
-    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-bgpvpn-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 7 * * 2,5'
 - trigger:
-    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-ovn-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 23 * * *'
 - trigger:
-    name: 'fuel-os-odl-ovs-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-odl-ovs-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 2 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-ovs-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 9 * * *'
 - trigger:
-    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-os-nosdn-fdio-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '0 13 * * 6,7'
 - trigger:
-    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-hunter-trigger'
+    name: 'fuel-k8-calico-nofeature-noha-virtual-daily-iruya-trigger'
     triggers:
       - timed: '5 13 * * 6,7'
 # ----------------------------------------------

diff --git a/jjb/fuel/fuel-docker-jobs.yaml b/jjb/fuel/fuel-docker-jobs.yaml
index 5149038..a78bb1c 100644 (file)
--- a/jjb/fuel/fuel-docker-jobs.yaml
+++ b/jjb/fuel/fuel-docker-jobs.yaml
@@ -12,7 +12,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
 

diff --git a/jjb/fuel/fuel-rtd-jobs.yaml b/jjb/fuel/fuel-rtd-jobs.yaml
index 3775be8..2a7cc5b 100644 (file)
--- a/jjb/fuel/fuel-rtd-jobs.yaml
+++ b/jjb/fuel/fuel-rtd-jobs.yaml
@@ -12,7 +12,7 @@
       - master:
           branch: '{stream}'
           disabled: false
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           disabled: false
 

diff --git a/jjb/fuel/fuel-verify-jobs.yaml b/jjb/fuel/fuel-verify-jobs.yaml
index 0248907..dcc8b30 100644 (file)
--- a/jjb/fuel/fuel-verify-jobs.yaml
+++ b/jjb/fuel/fuel-verify-jobs.yaml
@@ -14,7 +14,7 @@
           gs-pathname: ''
           disabled: false
           functest_docker_tag: iruya
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/functest/functest-daily-jobs.yaml b/jjb/functest/functest-daily-jobs.yaml
index 3f5e7fd..3cdff3d 100644 (file)
--- a/jjb/functest/functest-daily-jobs.yaml
+++ b/jjb/functest/functest-daily-jobs.yaml
@@ -43,11 +43,11 @@
       - baremetal:
           slave-label: fuel-baremetal
           installer: fuel
-          <<: *hunter
+          <<: *iruya
       - virtual:
           slave-label: fuel-virtual
           installer: fuel
-          <<: *hunter
+          <<: *iruya
       # apex CI PODs
       - virtual:
           slave-label: apex-virtual-master
@@ -60,11 +60,11 @@
       - virtual:
           slave-label: apex-virtual-master
           installer: apex
-          <<: *hunter
+          <<: *iruya
       - baremetal:
           slave-label: apex-baremetal-master
           installer: apex
-          <<: *hunter
+          <<: *iruya
       # armband CI PODs
       - armband-baremetal:
           slave-label: armband-baremetal
@@ -73,7 +73,7 @@
       - armband-baremetal:
           slave-label: armband-baremetal
           installer: fuel
-          <<: *hunter
+          <<: *iruya
       # fuel NONE CI PODs
       - zte-pod1:
           slave-label: fuel-baremetal

diff --git a/jjb/functest/functest-docker.yaml b/jjb/functest/functest-docker.yaml
index a0741f1..c11b4e1 100644 (file)
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -38,12 +38,19 @@
       - 'vnf'
       - 'smoke-cntt'
       - 'benchmarking-cntt'
+      - 'features'
 
     exclude:
       - stream: 'master'
         image: 'tempest'
       - stream: 'jerma'
         image: 'tempest'
+      - stream: 'master'
+        image: 'features'
+      - stream: 'jerma'
+        image: 'features'
+      - stream: 'iruya'
+        image: 'features'
 
     # settings for jobs run in multijob phases
     build-job-settings: &build-job-settings
@@ -154,6 +161,10 @@
               <<: *build-job-settings
             - name: 'functest-vnf-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-features-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-features-docker-build-arm64-{stream}'
+              <<: *build-job-settings
       - multijob:
           name: 'publish all manifests'
           condition: SUCCESSFUL
@@ -167,6 +178,8 @@
               <<: *manifest-job-settings
             - name: 'functest-vnf-docker-manifest-{stream}'
               <<: *manifest-job-settings
+            - name: 'functest-features-docker-manifest-{stream}'
+              <<: *manifest-job-settings
       - multijob:
           name: 'build all functest cntt images'
           condition: SUCCESSFUL

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index 12c9c26..fcc1eb1 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -28,6 +28,12 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: functest-kubernetes-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: functest-kubernetes-branch
     parameters:
@@ -35,6 +41,19 @@
           name: branch
           default: '{branch}'
 
+- parameter:
+    name: functest-kubernetes-DEBUG
+    parameters:
+      - string:
+          name: DEBUG
+          default: 'true'
+- parameter:
+    name: functest-kubernetes-DEPLOY_SCENARIO
+    parameters:
+      - string:
+          name: DEPLOY_SCENARIO
+          default: k8-nosdn-nofeature-noha
+
 - functest-kubernetes-containers: &functest-kubernetes-containers
     name: 'functest-kubernetes-containers'
     repo: '{repo}'
@@ -43,16 +62,10 @@
     tag: '{tag}'
 
 - functest-kubernetes-run-containers: &functest-kubernetes-run-containers
-    name: 'functest-kubernetes-build-containers'
+    name: 'functest-kubernetes-run-containers'
     <<: *functest-kubernetes-containers
     test: '{test}'
 
-- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
-    name: 'functest-kubernetes-build-containers'
-    <<: *functest-kubernetes-containers
-    ref_arg: '{ref_arg}'
-    path: '{path}'
-
 - builder:
     name: functest-kubernetes-pull-containers
     builders:
@@ -68,10 +81,11 @@
           docker pull $image
 
 - builder:
-    name: functest-kubernetes-build-containers
+    name: functest-kubernetes-run-containers
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -79,22 +93,26 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
-          fi
-          cd {path}
-          docker build $build_arg \
-            --pull=false --no-cache --force-rm=true \
-            -t $image .
+          docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$slave \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=$DEBUG \
+            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
+            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            $image run_tests -t {test} -p -r
 
 - builder:
-    name: functest-kubernetes-run-containers
+    name: functest-kubernetes-remove-images
     builders:
       - shell: |
-          set +ex
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          set +x
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -102,18 +120,16 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker run --rm \
-            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID \
-            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEPLOY_SCENARIO=k8-nosdn-nofeature-noha \
-            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
-            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
-            $image run_tests -t {test} -p
+          docker rmi $image || true
+
+- functest-kubernetes-build-containers: &functest-kubernetes-build-containers
+    name: 'functest-kubernetes-build-containers'
+    <<: *functest-kubernetes-containers
+    ref_arg: '{ref_arg}'
+    path: '{path}'
 
 - builder:
-    name: functest-kubernetes-remove-images
+    name: functest-kubernetes-build-containers
     builders:
       - shell: |
           set +x
@@ -124,7 +140,15 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          docker rmi $image || true
+          if [ "{ref_arg}" = "None" ]; then
+            build_arg=""
+          else
+            build_arg="--build-arg {ref_arg}={ref}"
+          fi
+          cd {path}
+          docker build $build_arg \
+            --pull=false --no-cache --force-rm=true \
+            -t $image .
 
 - scm:
     name: functest-kubernetes-scm
@@ -186,6 +210,12 @@
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
     builders:
       - functest-kubernetes-run-containers:
           <<: *functest-kubernetes-run-containers
@@ -206,13 +236,63 @@
     test:
       - xrally_kubernetes
       - k8s_conformance
-    jobs:
-      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
     exclude:
       - tag: iruya
         test: xrally_kubernetes
       - tag: hunter
         test: xrally_kubernetes
+    jobs:
+      - 'functest-kubernetes-{repo}-{container}-{tag}-{test}-run'
+
+
+- builder:
+    name: functest-kubernetes-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/functest-kubernetes \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest-kubernetes \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=$DEBUG \
+            -e DEPLOY_SCENARIO=$DEPLOY_SCENARIO \
+            -v /home/opnfv/functest-kubernetes/config.{tag}:/root/.kube/config \
+            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'functest-kubernetes-{tag}-zip'
+    parameters:
+      - functest-kubernetes-slave:
+          slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
+    builders:
+      - functest-kubernetes-zip:
+          <<: *functest-kubernetes-containers
+
+- project:
+    name: 'functest-kubernetes-{tag}-zip'
+    <<: *functest-kubernetes-params
+    container: 'functest-kubernetes-healthcheck'
+    jobs:
+      - 'functest-kubernetes-{tag}-zip'
 
 - job-template:
     name: 'functest-kubernetes-{tag}-daily'
@@ -222,6 +302,12 @@
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -256,6 +342,11 @@
               <<: *functest-kubernetes-jobs
             - name: 'functest-kubernetes-opnfv-functest-kubernetes-smoke-{tag}-k8s_conformance-run'
               <<: *functest-kubernetes-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'functest-kubernetes-{tag}-zip'
+              <<: *functest-kubernetes-jobs
 
 - job-template:
     name: 'functest-kubernetes-{repo}-{container}-{tag}-gate'
@@ -286,21 +377,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi'
+    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
     repo: _
     port:
     container: golang
-    tag: '1.12-alpine3.10'
+    tag: '1.13-alpine3.11'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
+    name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
     repo: _
     port:
     container: golang
-    tag: '1.12-alpine3.10'
+    tag: '1.13-alpine3.11'
     slave: master
     jobs:
       - 'functest-kubernetes-{repo}-{container}-{tag}-pull'
@@ -341,8 +432,14 @@
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
       - functest-kubernetes-branch:
           branch: '{branch}'
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -360,12 +457,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core
@@ -428,6 +525,12 @@
     parameters:
       - functest-kubernetes-slave:
           slave: '{slave}'
+      - functest-kubernetes-build_tag:
+          build_tag: ''
+      - functest-kubernetes-DEBUG:
+          DEBUG: 'true'
+      - functest-kubernetes-DEPLOY_SCENARIO:
+          DEPLOY_SCENARIO: k8-nosdn-nofeature-noha
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -445,12 +548,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-rmi'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-rmi'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-kubernetes-_-golang-1.12-alpine3.10-pull'
+            - name: 'functest-kubernetes-_-golang-1.13-alpine3.11-pull'
               <<: *functest-kubernetes-jobs
       - multijob:
           name: build opnfv/functest-kubernetes-core

diff --git a/jjb/functest/functest-project-jobs.yaml b/jjb/functest/functest-project-jobs.yaml
index 0a83644..306c3ca 100644 (file)
--- a/jjb/functest/functest-project-jobs.yaml
+++ b/jjb/functest/functest-project-jobs.yaml
@@ -4,16 +4,16 @@
     tag:
       - latest:
           branch: master
-          slave: lf-virtual9
+          slave: lf-virtual1
       - jerma:
           branch: stable/jerma
-          slave: lf-virtual4
+          slave: lf-virtual1
       - iruya:
           branch: stable/iruya
-          slave: lf-virtual4
+          slave: lf-virtual1
       - hunter:
           branch: stable/hunter
-          slave: lf-virtual6
+          slave: lf-virtual1
 
 - builder:
     name: functest-run-tox

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index feb672c..b93be3a 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -14,8 +14,8 @@
           dashboard_url: http://172.30.13.94
       - jerma:
           branch: stable/jerma
-          slave: lf-virtual4
-          dashboard_url: http://172.30.13.89
+          slave: lf-pod4
+          dashboard_url: http://172.30.12.83
       - iruya:
           branch: stable/iruya
           slave: lf-virtual4
@@ -32,6 +32,12 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: functest-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: functest-branch
     parameters:
@@ -132,21 +138,24 @@
           fi
           sudo docker run --rm \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$slave \
+            -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -e DEBUG=$DEBUG \
             -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
             -e DASHBOARD_URL={dashboard_url} \
+            -e VOLUME_DEVICE_NAME=sdb \
+            -e IMAGE_PROPERTIES=hw_scsi_model:virtio-scsi,hw_disk_bus:scsi \
             -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/tempest_blacklist.yaml:/usr/lib/python$py/\
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/\
           blacklist.yaml \
-            -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\
-          site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
             -v /home/opnfv/functest/.boto:/root/.boto \
-            $image run_tests -t {test} -p
+            $image run_tests -t {test} -r -p
 
 - builder:
     name: functest-remove-images
@@ -264,6 +273,8 @@
     parameters:
       - functest-slave:
           slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
       - functest-DEBUG:
           DEBUG: 'true'
       - functest-EXTERNAL_NETWORK:
@@ -378,6 +389,45 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
+- builder:
+    name: functest-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/functest \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/functest \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'functest-{tag}-zip'
+    parameters:
+      - functest-build_tag:
+          build_tag: ''
+    builders:
+      - functest-zip:
+          <<: *functest-containers
+
+- project:
+    name: 'functest-{tag}-zip'
+    <<: *functest-params
+    container: 'functest-healthcheck'
+    jobs:
+      - 'functest-{tag}-zip'
+
 - job-template:
     name: 'functest-{tag}-daily'
     project-type: multijob
@@ -386,6 +436,8 @@
     parameters:
       - functest-slave:
           slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
       - functest-DEBUG:
           DEBUG: 'true'
       - functest-EXTERNAL_NETWORK:
@@ -531,6 +583,11 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *functest-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'functest-{tag}-zip'
+              <<: *functest-jobs
 
 - job-template:
     name: 'functest-{repo}-{container}-{tag}-gate'
@@ -561,21 +618,21 @@
           ref: $branch
 
 - project:
-    name: 'functest-_-alpine-3.10-rmi'
+    name: 'functest-_-alpine-3.11-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.10'
+    tag: '3.11'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'functest-_-alpine-3.10-pull'
+    name: 'functest-_-alpine-3.11-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.10'
+    tag: '3.11'
     slave: master
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
@@ -659,6 +716,8 @@
     parameters:
       - functest-slave:
           slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
       - functest-branch:
           branch: '{branch}'
       - functest-DEBUG:
@@ -688,12 +747,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-rmi'
+            - name: 'functest-_-alpine-3.11-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-pull'
+            - name: 'functest-_-alpine-3.11-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core
@@ -862,6 +921,8 @@
     parameters:
       - functest-slave:
           slave: '{slave}'
+      - functest-build_tag:
+          build_tag: ''
       - functest-DEBUG:
           DEBUG: 'true'
       - functest-EXTERNAL_NETWORK:
@@ -889,12 +950,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-rmi'
+            - name: 'functest-_-alpine-3.11-rmi'
               <<: *functest-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'functest-_-alpine-3.10-pull'
+            - name: 'functest-_-alpine-3.11-pull'
               <<: *functest-jobs
       - multijob:
           name: build opnfv/functest-core

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index b34fc10..44231e4 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -28,6 +28,12 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: xtesting-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
 - parameter:
     name: xtesting-branch
     parameters:
@@ -35,6 +41,13 @@
           name: branch
           default: '{branch}'
 
+- parameter:
+    name: xtesting-DEBUG
+    parameters:
+      - string:
+          name: DEBUG
+          default: 'true'
+
 - xtesting-containers: &xtesting-containers
     name: 'xtesting-containers'
     repo: '{repo}'
@@ -43,16 +56,10 @@
     tag: '{tag}'
 
 - xtesting-run-containers: &xtesting-run-containers
-    name: 'xtesting-build-containers'
+    name: 'xtesting-run-containers'
     <<: *xtesting-containers
     test: '{test}'
 
-- xtesting-build-containers: &xtesting-build-containers
-    name: 'xtesting-build-containers'
-    <<: *xtesting-containers
-    ref_arg: '{ref_arg}'
-    path: '{path}'
-
 - builder:
     name: xtesting-pull-containers
     builders:
@@ -68,10 +75,11 @@
           sudo docker pull $image
 
 - builder:
-    name: xtesting-build-containers
+    name: xtesting-run-containers
     builders:
       - shell: |
           set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -79,22 +87,24 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          if [ "{ref_arg}" = "None" ]; then
-            build_arg=""
-          else
-            build_arg="--build-arg {ref_arg}={ref}"
-          fi
-          cd {path}
-          sudo docker build $build_arg \
-            --pull=false --no-cache --force-rm=true \
-            -t $image .
+          sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$BUILD_TAG/$JOB_NAME-$BUILD_ID \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$slave \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=$DEBUG \
+            -v /home/opnfv/xtesting/.boto:/root/.boto \
+            $image run_tests -t {test} -p -r
 
 - builder:
-    name: xtesting-run-containers
+    name: xtesting-remove-images
     builders:
       - shell: |
           set +x
-          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
           elif [ "{port}" = "None" ]; then
@@ -102,17 +112,16 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker run --rm \
-            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
-            -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
-            -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID \
-            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -v /home/opnfv/xtesting/.boto:/root/.boto \
-            -e DEBUG=true \
-            $image run_tests -t {test} -p
+          sudo docker rmi $image || true
+
+- xtesting-build-containers: &xtesting-build-containers
+    name: 'xtesting-build-containers'
+    <<: *xtesting-containers
+    ref_arg: '{ref_arg}'
+    path: '{path}'
 
 - builder:
-    name: xtesting-remove-images
+    name: xtesting-build-containers
     builders:
       - shell: |
           set +x
@@ -123,7 +132,15 @@
           else
             image={repo}:{port}/{container}:{tag}
           fi
-          sudo docker rmi $image || true
+          if [ "{ref_arg}" = "None" ]; then
+            build_arg=""
+          else
+            build_arg="--build-arg {ref_arg}={ref}"
+          fi
+          cd {path}
+          sudo docker build $build_arg \
+            --pull=false --no-cache --force-rm=true \
+            -t $image .
 
 - scm:
     name: xtesting-scm
@@ -171,6 +188,10 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
+      - xtesting-DEBUG:
+          DEBUG: 'true'
     builders:
       - xtesting-run-containers:
           <<: *xtesting-run-containers
@@ -194,6 +215,52 @@
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-{test}-run'
 
+
+- builder:
+    name: xtesting-zip
+    builders:
+      - shell: |
+          set +x
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
+          if [ "{repo}" = "_" ]; then
+            image={container}:{tag}
+          elif [ "{port}" = "None" ]; then
+            image={repo}/{container}:{tag}
+          else
+            image={repo}:{port}/{container}:{tag}
+          fi
+          sudo docker run --rm \
+            -e S3_ENDPOINT_URL=https://storage.googleapis.com \
+            -e S3_DST_URL=s3://artifacts.opnfv.org/xtesting \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/xtesting \
+            -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e BUILD_TAG=$BUILD_TAG \
+            -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
+            -e DEBUG=$DEBUG \
+            -v /home/opnfv/xtesting/.boto:/root/.boto \
+            $image zip_campaign
+
+- job-template:
+    name: 'xtesting-{tag}-zip'
+    parameters:
+      - xtesting-slave:
+          slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
+      - xtesting-DEBUG:
+          DEBUG: 'true'
+    builders:
+      - xtesting-zip:
+          <<: *xtesting-containers
+
+- project:
+    name: 'xtesting-{tag}-zip'
+    <<: *xtesting-params
+    container: 'xtesting'
+    jobs:
+      - 'xtesting-{tag}-zip'
+
 - job-template:
     name: 'xtesting-{tag}-daily'
     project-type: multijob
@@ -202,6 +269,10 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
+      - xtesting-DEBUG:
+          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -234,6 +305,11 @@
               <<: *xtesting-jobs
             - name: 'xtesting-opnfv-xtesting-{tag}-sixth-run'
               <<: *xtesting-jobs
+      - multijob:
+          name: dump all campaign data
+          projects:
+            - name: 'xtesting-{tag}-zip'
+              <<: *xtesting-jobs
 
 - job-template:
     name: 'xtesting-{repo}-{container}-{tag}-gate'
@@ -264,21 +340,21 @@
           ref: $branch
 
 - project:
-    name: 'xtesting-_-alpine-3.10-rmi'
+    name: 'xtesting-_-alpine-3.11-rmi'
     repo: _
     port:
     container: alpine
-    tag: '3.10'
+    tag: '3.11'
     slave: master
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-rmi'
 
 - project:
-    name: 'xtesting-_-alpine-3.10-pull'
+    name: 'xtesting-_-alpine-3.11-pull'
     repo: _
     port:
     container: alpine
-    tag: '3.10'
+    tag: '3.11'
     slave: master
     jobs:
       - 'xtesting-{repo}-{container}-{tag}-pull'
@@ -299,8 +375,12 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
       - xtesting-branch:
           branch: '{branch}'
+      - xtesting-DEBUG:
+          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -316,12 +396,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.10-rmi'
+            - name: 'xtesting-_-alpine-3.11-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.10-pull'
+            - name: 'xtesting-_-alpine-3.11-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting
@@ -376,6 +456,10 @@
     parameters:
       - xtesting-slave:
           slave: '{slave}'
+      - xtesting-build_tag:
+          build_tag: ''
+      - xtesting-DEBUG:
+          DEBUG: 'true'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -391,12 +475,12 @@
       - multijob:
           name: remove dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.10-rmi'
+            - name: 'xtesting-_-alpine-3.11-rmi'
               <<: *xtesting-jobs
       - multijob:
           name: pull dependencies
           projects:
-            - name: 'xtesting-_-alpine-3.10-pull'
+            - name: 'xtesting-_-alpine-3.11-pull'
               <<: *xtesting-jobs
       - multijob:
           name: opnfv/xtesting

diff --git a/jjb/global/releng-macros.yaml b/jjb/global/releng-macros.yaml
index 5b1bdee..0599035 100644 (file)
--- a/jjb/global/releng-macros.yaml
+++ b/jjb/global/releng-macros.yaml
@@ -641,14 +641,6 @@
           recipients: >
             stephen.wong1@huawei.com
 
-- publisher:
-    name: 'email-conductor-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            limingjiang@huawei.com
-
 - publisher:
     name: 'email-container4nfv-ptl'
     publishers:
@@ -865,14 +857,6 @@
         recipients: >
           pberberian@iol.unh.edu
 
-- publisher:
-    name: 'email-promise-ptl'
-    publishers:
-      - email-ext:
-          <<: *email_ptl_defaults
-          recipients: >
-            kunzmann@docomolab-euro.com
-
 - publisher:
     name: 'email-qtip-ptl'
     publishers:

diff --git a/jjb/octopus/octopus-views.yaml b/jjb/octopus/octopus-views.yaml
deleted file mode 100644 (file)
index 00bc090..0000000
--- a/jjb/octopus/octopus-views.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
----
-- project:
-    name: octopus-view
-    views:
-      - common-view
-    view-name: octopus
-    view-regex: ^octopus.*

diff --git a/jjb/opnfvdocs/docs-rtd.yaml b/jjb/opnfvdocs/docs-rtd.yaml
index 598ff5b..fbfa051 100644 (file)
--- a/jjb/opnfvdocs/docs-rtd.yaml
+++ b/jjb/opnfvdocs/docs-rtd.yaml
@@ -14,7 +14,7 @@
     stream:
       - master:
           branch: 'master'
-      - hunter:
+      - iruya:
           branch: 'stable/{stream}'
 
 - job-template:

diff --git a/jjb/promise/promise-views.yaml b/jjb/promise/promise-views.yaml
deleted file mode 100644 (file)
index 6f67d64..0000000
--- a/jjb/promise/promise-views.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
----
-- project:
-    name: promise-view
-    views:
-      - project-view
-    project-name: promise

diff --git a/jjb/releng/opnfv-docker-arm.yaml b/jjb/releng/opnfv-docker-arm.yaml
index a259da5..a413326 100644 (file)
--- a/jjb/releng/opnfv-docker-arm.yaml
+++ b/jjb/releng/opnfv-docker-arm.yaml
@@ -15,18 +15,14 @@
       stream: euphrates
       branch: 'stable/{stream}'
       disabled: false
-    fraser: &fraser
-      stream: fraser
-      branch: 'stable/{stream}'
-      disabled: false
-    gambia: &gambia
-      stream: gambia
-      branch: 'stable/{stream}'
-      disabled: false
     hunter: &hunter
       stream: hunter
       branch: 'stable/{stream}'
       disabled: false
+    iruya: &iruya
+      stream: iruya
+      branch: 'stable/{stream}'
+      disabled: false
     dovetail-arm-receivers: &dovetail-arm-receivers
       receivers: >
           cristina.pauna@enea.com
@@ -35,7 +31,7 @@
       receivers: >
           cristina.pauna@enea.com
           alexandru.avadanii@enea.com
-          mark.beierl@emc.com
+          mbeierl@vmware.com
     yardstick-arm-receivers: &yardstick-arm-receivers
       receivers: >
           cristina.pauna@enea.com
@@ -92,54 +88,77 @@
           arch_tag: 'aarch64'
           <<: *master
           <<: *storperf-arm-receivers
+      - 'storperf-workloadagent':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-workloadagent'
+          docker_repo_name: 'opnfv/storperf-workloadagent'
+          arch_tag: 'aarch64'
+          <<: *master
+          <<: *storperf-arm-receivers
       - 'yardstick':
           project: 'yardstick'
           <<: *master
           <<: *yardstick-arm-receivers
+
       # projects with jobs for stable/euphrates
       - 'dovetail':
           project: 'dovetail'
           <<: *euphrates
           <<: *dovetail-arm-receivers
+
+      # projects with jobs for stable/hunter
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *hunter
+          <<: *yardstick-arm-receivers
+
+      # projects with jobs for stable/iruya
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *iruya
+          <<: *yardstick-arm-receivers
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
           docker_repo_name: 'opnfv/storperf-master'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           docker_repo_name: 'opnfv/storperf-graphite'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           docker_repo_name: 'opnfv/storperf-httpfrontend'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           docker_repo_name: 'opnfv/storperf-reporting'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-arm-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           docker_repo_name: 'opnfv/storperf-swaggerui'
           arch_tag: 'aarch64'
-          <<: *hunter
+          <<: *iruya
+          <<: *storperf-arm-receivers
+      - 'storperf-workloadagent':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-workloadagent'
+          docker_repo_name: 'opnfv/storperf-workloadagent'
+          arch_tag: 'aarch64'
+          <<: *iruya
           <<: *storperf-arm-receivers
-      - 'yardstick':
-          project: 'yardstick'
-          <<: *hunter
-          <<: *yardstick-arm-receivers
 
     # yamllint enable rule:key-duplicates
     jobs:

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index f334c67..24b1b85 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -15,13 +15,17 @@
       stream: hunter
       branch: 'stable/{stream}'
       disabled: false
+    iruya: &iruya
+      stream: iruya
+      branch: 'stable/{stream}'
+      disabled: false
     laas-receivers: &laas_receivers
       receivers: >
           pberberian@iol.unh.edu
           sbergeron@iol.unh.edu
     storperf-receivers: &storperf-receivers
       receivers: >
-          mark.beierl@emc.com
+          mbeierl@vmware.com
     yardstick-receivers: &yardstick-receivers
       receivers: >
           rexlee8776@gmail.com
@@ -48,6 +52,12 @@
           dockerdir: 'docker/barometer-collectd'
           <<: *master
           <<: *other-receivers
+      - 'barometer-collectd-experimental':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+          <<: *master
+          <<: *other-receivers
       - 'barometer-collectd-master':
           project: 'barometer'
           dockerdir: '.'
@@ -253,6 +263,12 @@
           arch_tag: 'x86_64'
           <<: *master
           <<: *storperf-receivers
+      - 'storperf-workloadagent':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-workloadagent'
+          arch_tag: 'x86_64'
+          <<: *master
+          <<: *storperf-receivers
       - 'yardstick':
           project: 'yardstick'
           <<: *master
@@ -269,85 +285,108 @@
           <<: *yardstick-receivers
 
       # projects with jobs for hunter
+      - 'bottlenecks':
+          project: 'bottlenecks'
+          <<: *hunter
+          <<: *other-receivers
+      - 'dovetail':
+          project: 'dovetail'
+          <<: *hunter
+          <<: *other-receivers
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *hunter
+          <<: *yardstick-receivers
+
+      # projects with jobs for iruya
+      - 'yardstick':
+          project: 'yardstick'
+          <<: *iruya
+          <<: *yardstick-receivers
       - 'barometer-dma':
           project: 'barometer'
           dockerdir: 'docker/barometer-dma'
-          <<: *hunter
+          <<: *iruya
           <<: *other-receivers
       - 'barometer-collectd':
           project: 'barometer'
           dockerdir: 'docker/barometer-collectd'
-          <<: *hunter
+          <<: *iruya
+          <<: *other-receivers
+      - 'barometer-collectd-experimental':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+          <<: *iruya
           <<: *other-receivers
       - 'barometer-collectd-master':
           project: 'barometer'
           dockerdir: '.'
           dockerfile: 'docker/barometer-collectd-master/Dockerfile'
-          <<: *hunter
+          <<: *iruya
           <<: *other-receivers
       - 'barometer-grafana':
           project: 'barometer'
           dockerdir: 'docker/barometer-grafana'
-          <<: *hunter
+          <<: *iruya
           <<: *other-receivers
       - 'barometer-influxdb':
           project: 'barometer'
           dockerdir: 'docker/barometer-influxdb'
-          <<: *hunter
+          <<: *iruya
           <<: *other-receivers
       - 'barometer-kafka':
           project: 'barometer'
           dockerdir: 'docker/barometer-kafka'
-          <<: *hunter
+          <<: *iruya
           <<: *other-receivers
       - 'barometer-ves':
           project: 'barometer'
           dockerdir: 'docker/barometer-ves'
-          <<: *hunter
+          <<: *iruya
           <<: *other-receivers
       - 'barometer-snmp':
           project: 'barometer'
           dockerdir: 'docker/barometer-snmp'
-          <<: *hunter
-          <<: *other-receivers
-      - 'bottlenecks':
-          project: 'bottlenecks'
-          <<: *hunter
+          <<: *iruya
           <<: *other-receivers
       - 'storperf-master':
           project: 'storperf'
           dockerdir: 'docker/storperf-master'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-graphite':
           project: 'storperf'
           dockerdir: 'docker/storperf-graphite'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-httpfrontend':
           project: 'storperf'
           dockerdir: 'docker/storperf-httpfrontend'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-reporting':
           project: 'storperf'
           dockerdir: 'docker/storperf-reporting'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
       - 'storperf-swaggerui':
           project: 'storperf'
           dockerdir: 'docker/storperf-swaggerui'
           arch_tag: 'x86_64'
-          <<: *hunter
+          <<: *iruya
           <<: *storperf-receivers
-      - 'yardstick':
-          project: 'yardstick'
-          <<: *hunter
-          <<: *yardstick-receivers
+      - 'storperf-workloadagent':
+          project: 'storperf'
+          dockerdir: 'docker/storperf-workloadagent'
+          arch_tag: 'x86_64'
+          <<: *iruya
+          <<: *storperf-receivers
+
     # yamllint enable rule:key-duplicates
     jobs:
       - "{dockerrepo}-docker-build-push-{stream}"

diff --git a/jjb/storperf/storperf-verify-jobs.yaml b/jjb/storperf/storperf-verify-jobs.yaml
index 842aea6..8c43e53 100644 (file)
--- a/jjb/storperf/storperf-verify-jobs.yaml
+++ b/jjb/storperf/storperf-verify-jobs.yaml
@@ -13,7 +13,7 @@
           gs-pathname: ''
           disabled: false
           docker-tag: 'latest'
-      - hunter: &hunter
+      - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
index 74734b8..e4d0be6 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ b/jjb/yardstick/yardstick-project-jobs.yaml
@@ -17,7 +17,7 @@
           branch: '{stream}'
           gs-pathname: ''
           disabled: false
-      - hunter: &hunter
+      - iruya: &iruya
           branch: 'stable/{stream}'
           gs-pathname: '/{stream}'
           disabled: false

diff --git a/releases/hunter/dovetail.yaml b/releases/hunter/dovetail.yaml
new file mode 100644 (file)
index 0000000..55dafd1
--- /dev/null
+++ b/releases/hunter/dovetail.yaml
@@ -0,0 +1,9 @@
+---
+project: dovetail
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      dovetail: d2291d12050c22cea7a92f68eaa75e2c9c50cd2f

diff --git a/releases/iruya/airship.yaml b/releases/iruya/airship.yaml
index 2eed6fc..8c55558 100644 (file)
--- a/releases/iruya/airship.yaml
+++ b/releases/iruya/airship.yaml
@@ -11,6 +11,14 @@ project: airship
 project-type: installer
 release-model: stable
 
+releases:
+  - version: opnfv-9.0.0
+    location:
+      airship: 36fc72a853884ddbb56b296db3b233e9aa96d671
+  - version: opnfv-9.0.1
+    location:
+      airship: e08cedd88c945449c6b7b57c4d353b7f00546e98
+
 branches:
   - name: stable/iruya
     location:

diff --git a/releases/iruya/barometer.yaml b/releases/iruya/barometer.yaml
new file mode 100644 (file)
index 0000000..0567931
--- /dev/null
+++ b/releases/iruya/barometer.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2018 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: barometer
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      barometer: ed42941aa613ba9612ce53c0e812309d14e35955

diff --git a/releases/iruya/bottlenecks.yaml b/releases/iruya/bottlenecks.yaml
new file mode 100644 (file)
index 0000000..f2fbb71
--- /dev/null
+++ b/releases/iruya/bottlenecks.yaml
@@ -0,0 +1,9 @@
+---
+project: bottlenecks
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      bottlenecks: b6c7bba0c071b42172283e4d97a3641f6464857a

diff --git a/releases/iruya/doctor.yaml b/releases/iruya/doctor.yaml
index 070130c..7a7a919 100644 (file)
--- a/releases/iruya/doctor.yaml
+++ b/releases/iruya/doctor.yaml
@@ -1,6 +1,6 @@
 # SPDX-License-Identifier: Apache-2.0
 ##############################################################################
-# Copyright (c) 2019 Nokia Corporation and others.
+# Copyright (c) 2020 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
@@ -11,7 +11,14 @@ project: doctor
 project-type: feature
 release-model: stable
 
+releases:
+  - version: opnfv-9.0.0
+    location:
+      doctor: b530bac56e3d35bf69e23595aa5bb9c3ceea61b6
+
 branches:
   - name: stable/iruya
     location:
       doctor: b530bac56e3d35bf69e23595aa5bb9c3ceea61b6
+
+release-notes: https://opnfv-doctor.readthedocs.io/en/stable-iruya/release/release-notes/index.html#doctor-releasenotes

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

diff --git a/releases/iruya/fds.yaml b/releases/iruya/fds.yaml
new file mode 100644 (file)
index 0000000..d09a93f
--- /dev/null
+++ b/releases/iruya/fds.yaml
@@ -0,0 +1,9 @@
+---
+project: fds
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      fds: 20cef81fd594f10949e151fd5a0a439af0a844e4

diff --git a/releases/iruya/fuel.yaml b/releases/iruya/fuel.yaml
new file mode 100644 (file)
index 0000000..02f74b7
--- /dev/null
+++ b/releases/iruya/fuel.yaml
@@ -0,0 +1,24 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 The Linux Foundation and others.
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Apache License, Version 2.0
+# which accompanies this distribution, and is available at
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: fuel
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      fuel: d8f0a6b4fd9c3cb10780abcbd9b446c48b08cced
+
+releases:
+  - version: opnfv-9.0.0
+    location:
+      fuel: e6f1c557adf37baabf0afee6384ee99849cd25e8
+
+release-notes: https://opnfv-fuel.readthedocs.io/en/stable-iruya/release/release-notes/release-notes.html

diff --git a/releases/iruya/opnfvdocs.yaml b/releases/iruya/opnfvdocs.yaml
new file mode 100644 (file)
index 0000000..0829b8a
--- /dev/null
+++ b/releases/iruya/opnfvdocs.yaml
@@ -0,0 +1,9 @@
+---
+project: opnfvdocs
+project-type: infra
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      opnfvdocs: dc8743fed0cbb123a22053a1f057648755b86612

diff --git a/releases/iruya/rocket.yaml b/releases/iruya/rocket.yaml
new file mode 100644 (file)
index 0000000..2e078a0
--- /dev/null
+++ b/releases/iruya/rocket.yaml
@@ -0,0 +1,9 @@
+---
+project: rocket
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      rocket: 14d9cc0e2e5f4e9d136ff3f9e8a29f0bb71eee5d

diff --git a/releases/iruya/stor4nfv.yaml b/releases/iruya/stor4nfv.yaml
new file mode 100644 (file)
index 0000000..0c2f128
--- /dev/null
+++ b/releases/iruya/stor4nfv.yaml
@@ -0,0 +1,11 @@
+---
+project: stor4nfv
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      stor4nfv: 223c598c19bcd5190454369f16ed9ca25575be5e
+
+release-notes: https://opnfv-stor4nfv.readthedocs.io/en/latest/release/release-notes/release-notes.html

diff --git a/releases/iruya/storperf.yaml b/releases/iruya/storperf.yaml
new file mode 100644 (file)
index 0000000..17f5b6a
--- /dev/null
+++ b/releases/iruya/storperf.yaml
@@ -0,0 +1,9 @@
+---
+project: storperf
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      storperf: 8d97778672f843cd79ac9862b5fe8c13ef31091f

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

diff --git a/releases/iruya/yardstick.yaml b/releases/iruya/yardstick.yaml
new file mode 100644 (file)
index 0000000..428d231
--- /dev/null
+++ b/releases/iruya/yardstick.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 Huawei Technologies Co., Ltd. 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: yardstick
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      yardstick: 13967af6479058515fea6c94c4d5b8dc9da536cc