Merge "[release][barometer] Create barometer stable/jerma branch"

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index f8cd2cd..825fe10 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -11,7 +11,7 @@
       - latest:
           branch: master
           slave: intel-pod17
-          functest_tag: hunter
+          functest_tag: iruya
 
 - parameter:
     name: airship-slave
@@ -79,7 +79,7 @@
           else
             image={repo}:{port}/{container}:{functest_tag}
           fi
-          sudo docker run --rm \
+          sudo docker run --rm --dns 172.17.0.2 \
             -e S3_ENDPOINT_URL=https://storage.googleapis.com \
             -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 \
@@ -92,13 +92,16 @@
             -v /home/opnfv/functest/.boto:/root/.boto \
             -e DEBUG=$DEBUG \
             -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
-            -e DEPLOY_SCENARIO=os-nosdn-nofeature-ha \
+            -e DEPLOY_SCENARIO=ovs \
+            -e FLAVOR_EXTRA_SPECS=hw:mem_page_size:large \
+            -e NEW_USER_ROLE=_member_ \
+            -e NO_TENANT_NETWORK=true \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
-            -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python2.7/\
+            -v /home/opnfv/functest/tempest_conf.yaml:/usr/lib/python3.6/\
           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 \
+            -v /home/opnfv/functest/singlevm.py:/usr/lib/python3.6/\
+          site-packages/functest/core/singlevm.py \
             $image run_tests -t {test} -r -p
 
 - builder:
@@ -289,8 +292,11 @@
       - tempest_cinder
       - tempest_keystone
       - tempest_heat
+      - tempest_telemetry
       - rally_sanity
-      - refstack_defcore
+      - refstack_compute
+      - refstack_object
+      - refstack_platform
       - tempest_full
       - tempest_scenario
       - tempest_slow
@@ -298,6 +304,7 @@
       - networking-bgpvpn
       - networking-sfc
       - tempest_barbican
+      - tempest_octavia
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
@@ -339,13 +346,17 @@
           else
             image={repo}:{port}/{container}:{functest_tag}
           fi
-          sudo docker run --rm \
+          sudo docker run --rm --dns 172.17.0.2 \
             -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 \
+            -e DEPLOY_SCENARIO=ovs \
+            -e FLAVOR_EXTRA_SPECS=hw:mem_page_size:large \
+            -e NEW_USER_ROLE=_member_ \
+            -e NO_TENANT_NETWORK=true \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
             -v /home/opnfv/functest/.boto:/root/.boto \
             $image zip_campaign
@@ -368,10 +379,9 @@
 
 - job-template:
     name: 'airship-{tag}-daily'
-    disabled: true
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '0 6 * * 3,6'
     parameters:
       - airship-slave:
           slave: '{slave}'
@@ -459,9 +469,15 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_telemetry-run'
+              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_defcore-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_compute-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_object-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_plateform-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *airship-jobs
@@ -477,6 +493,8 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_octavia-run'
+              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}
           condition: ALWAYS
@@ -535,7 +553,6 @@
 
 - job-template:
     name: 'airship-{tag}-gate'
-    disabled: true
     project-type: multijob
     triggers:
       - airship-patchset-created:
@@ -568,10 +585,6 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rmi'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-benchmarking-{tag}-rmi'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-rmi'
-              <<: *airship-jobs
       - multijob:
           name: pull containers
           projects:
@@ -579,19 +592,11 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-pull'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-benchmarking-{tag}-pull'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-pull'
-              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{functest_tag}
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-healthcheck-{tag}-tenantnetwork1-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-healthcheck-{tag}-tenantnetwork2-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-vmready1-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-vmready2-run'
@@ -602,40 +607,12 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-vping_ssh-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-healthcheck-{tag}-vping_userdata-run'
-              <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-cinder_test-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-healthcheck-{tag}-odl-run'
-              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-smoke:{functest_tag}
           projects:
-            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-networking-bgpvpn-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-networking-sfc-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_barbican-run'
-              <<: *airship-jobs
-      - multijob:
-          name: opnfv/functest-benchmarking:{functest_tag}
-          projects:
-            - name: 'airship-opnfv-functest-benchmarking-{tag}-vmtp-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run'
-              <<: *airship-jobs
-      - multijob:
-          name: opnfv/functest-vnf:{functest_tag}
-          condition: ALWAYS
-          execution-type: SEQUENTIALLY
-          projects:
-            - name: 'airship-opnfv-functest-vnf-{tag}-cloudify-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-vyos_vrouter-run'
-              <<: *airship-jobs
-            - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *airship-jobs
 
 - project:

diff --git a/jjb/functest/functest.ovn.yaml b/jjb/functest/functest.ovn.yaml
index 2dce177..52ba238 100644 (file)
--- a/jjb/functest/functest.ovn.yaml
+++ b/jjb/functest/functest.ovn.yaml
@@ -494,6 +494,7 @@
 
 - job-template:
     name: 'functest-ovn-{tag}-daily'
+    disabled: true
     project-type: multijob
     triggers:
       - timed: '@daily'
@@ -809,6 +810,7 @@
 
 - job-template:
     name: 'functest-ovn-{tag}-check'
+    disabled: true
     project-type: multijob
     parameters:
       - functest-ovn-slave:
@@ -1033,6 +1035,7 @@
 
 - job-template:
     name: 'functest-ovn-{tag}-gate'
+    disabled: true
     project-type: multijob
     triggers:
       - functest-ovn-patchset-created:

diff --git a/releases/jerma/airship.yaml b/releases/jerma/airship.yaml
new file mode 100644 (file)
index 0000000..147784c
--- /dev/null
+++ b/releases/jerma/airship.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 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: airship
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/iruya
+    location:
+      airship: 53fcf67dbb9545fa939aa11386e26bfe3dda6cad

diff --git a/releases/jerma/doctor.yaml b/releases/jerma/doctor.yaml
new file mode 100644 (file)
index 0000000..2c08924
--- /dev/null
+++ b/releases/jerma/doctor.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# 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
+# http://www.apache.org/licenses/LICENSE-2.0
+##############################################################################
+---
+project: doctor
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/jerma
+    location:
+      doctor: 72a1f8c92f1692f1ea8dcb5bc706ec9939c30e0a

diff --git a/releases/jerma/kuberef.yaml b/releases/jerma/kuberef.yaml
new file mode 100644 (file)
index 0000000..27fc8e4
--- /dev/null
+++ b/releases/jerma/kuberef.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2020 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: kuberef
+project-type: installer
+release-model: stable
+
+branches:
+  - name: stable/jerma
+    location:
+      kuberef: d3916f20f0b10da360cc6c38b61e1ee04d6278c5

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