Merge "Stable Branch for Iruya:VSwitchperf"

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 69f5beb..0f903af 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -20,6 +20,26 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: airship-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
+- parameter:
+    name: airship-DEBUG
+    parameters:
+      - string:
+          name: DEBUG
+          default: 'true'
+
+- parameter:
+    name: airship-EXTERNAL_NETWORK
+    parameters:
+      - string:
+          name: EXTERNAL_NETWORK
+          default: public
+
 - airship-containers: &airship-containers
     name: 'airship-containers'
     repo: '{repo}'
@@ -50,7 +70,7 @@
     name: airship-run-containers
     builders:
       - shell: |
-          set +ex
+          set +x
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{functest_tag}
@@ -60,25 +80,24 @@
             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/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=intel-pod17 \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$slave \
             -e INSTALLER_TYPE=airship \
+            -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEBUG=True \
-            -e EXTERNAL_NETWORK=public \
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            -e DEBUG=$DEBUG \
+            -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
             -e DEPLOY_SCENARIO=os-nosdn-nofeature-ha \
             -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/\
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
-            $image run_tests -t {test} -r
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/airship/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            $image run_tests -t {test} -r -p
 
 - builder:
     name: airship-remove-images
@@ -100,7 +119,7 @@
       - shell: |
           set +x
           export TERM_OPTS=" "
-          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh deploy_site'
+          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh $slave deploy_site'
 
 - scm:
     name: airship-scm
@@ -228,6 +247,12 @@
     parameters:
       - airship-slave:
           slave: '{slave}'
+      - airship-build_tag:
+          build_tag: ''
+      - airship-DEBUG:
+          DEBUG: 'true'
+      - airship-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     builders:
       - airship-run-containers:
           <<: *airship-run-containers
@@ -258,10 +283,13 @@
     container: 'functest-smoke'
     test:
       - neutron-tempest-plugin-api
+      - tempest_cinder
+      - tempest_keystone
       - rally_sanity
       - refstack_defcore
       - tempest_full
       - tempest_scenario
+      - tempest_slow
       - patrole
       - neutron_trunk
       - networking-bgpvpn
@@ -303,8 +331,14 @@
     parameters:
       - airship-slave:
           slave: '{slave}'
+      - airship-build_tag:
+          build_tag: ''
       - airship-branch:
           branch: 'master'
+      - airship-DEBUG:
+          DEBUG: 'true'
+      - airship-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -373,6 +407,10 @@
           projects:
             - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_cinder-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run'
+              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -381,6 +419,8 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-run'
@@ -451,6 +491,12 @@
     parameters:
       - airship-slave:
           slave: '{slave}'
+      - airship-build_tag:
+          build_tag: ''
+      - airship-DEBUG:
+          DEBUG: 'true'
+      - airship-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true

diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index 0834bd8..c2abc81 100644 (file)
--- a/jjb/airship/cntt.yaml
+++ b/jjb/airship/cntt.yaml
@@ -20,6 +20,26 @@
           name: slave
           default: '{slave}'
 
+- parameter:
+    name: cntt-build_tag
+    parameters:
+      - random-string:
+          name: build_tag
+
+- parameter:
+    name: cntt-DEBUG
+    parameters:
+      - string:
+          name: DEBUG
+          default: 'true'
+
+- parameter:
+    name: cntt-EXTERNAL_NETWORK
+    parameters:
+      - string:
+          name: EXTERNAL_NETWORK
+          default: public
+
 - cntt-containers: &cntt-containers
     name: 'cntt-containers'
     repo: '{repo}'
@@ -50,7 +70,7 @@
     name: cntt-run-containers
     builders:
       - shell: |
-          set +ex
+          set +x
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{functest_tag}
@@ -60,25 +80,24 @@
             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/cntt/$JOB_NAME-$BUILD_ID \
+            -e HTTP_DST_URL=http://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
-            -e NODE_NAME=intel-pod10 \
+            -e TEST_DB_EXT_URL=http://testresults.opnfv.org/test/api/v1/results \
+            -e NODE_NAME=$slave \
             -e INSTALLER_TYPE=cntt \
+            -e BUILD_TAG=$BUILD_TAG \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEBUG=True \
-            -e EXTERNAL_NETWORK=public \
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            -e DEBUG=$DEBUG \
+            -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
             -e DEPLOY_SCENARIO=os-nosdn-nofeature-ha \
             -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/\
           site-packages/functest/opnfv_tests/openstack/tempest/custom_tests/tempest_conf.yaml \
-            $image run_tests -t {test} -r
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/cntt/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            $image run_tests -t {test} -r -p
 
 - builder:
     name: cntt-remove-images
@@ -100,7 +119,7 @@
       - shell: |
           set +x
           export TERM_OPTS=" "
-          sudo -H -E -u ubuntu bash -c 'tools/deploy.sh deploy_site'
+          sudo -H -E -u opnfv bash -c 'tools/deploy.sh $slave deploy_site'
 
 - scm:
     name: cntt-scm
@@ -120,7 +139,6 @@
 
 - job-template:
     name: 'cntt-deploy-daily-{tag}'
-    disabled: true
     parameters:
       - cntt-slave:
           slave: '{slave}'
@@ -173,6 +191,13 @@
     jobs:
       - 'cntt-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'cntt-opnfv-functest-smoke-cntt-pull'
+    <<: *cntt-params
+    container: 'functest-smoke-cntt'
+    jobs:
+      - 'cntt-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'cntt-opnfv-functest-benchmarking-pull'
     <<: *cntt-params
@@ -210,6 +235,13 @@
     jobs:
       - 'cntt-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'cntt-opnfv-functest-smoke-cntt-rmi'
+    <<: *cntt-params
+    container: 'functest-smoke-cntt'
+    jobs:
+      - 'cntt-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'cntt-opnfv-functest-benchmarking-rmi'
     <<: *cntt-params
@@ -229,6 +261,12 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
+      - cntt-DEBUG:
+          DEBUG: 'true'
+      - cntt-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     builders:
       - cntt-run-containers:
           <<: *cntt-run-containers
@@ -259,10 +297,13 @@
     container: 'functest-smoke'
     test:
       - neutron-tempest-plugin-api
+      - tempest_cinder
+      - tempest_keystone
       - rally_sanity
       - refstack_defcore
       - tempest_full
       - tempest_scenario
+      - tempest_slow
       - patrole
       - neutron_trunk
       - networking-bgpvpn
@@ -271,6 +312,21 @@
     jobs:
       - 'cntt-{repo}-{container}-{tag}-{test}-run'
 
+- project:
+    name: 'cntt-opnfv-functest-smoke-cntt'
+    <<: *cntt-params
+    container: 'functest-smoke-cntt'
+    test:
+      - neutron-tempest-plugin-api
+      - tempest_cinder
+      - tempest_keystone
+      - rally_sanity
+      - tempest_full
+      - tempest_scenario
+      - tempest_slow
+    jobs:
+      - 'cntt-{repo}-{container}-{tag}-{test}-run'
+
 - project:
     name: 'cntt-opnfv-functest-benchmarking'
     <<: *cntt-params
@@ -304,8 +360,14 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
       - cntt-branch:
           branch: 'master'
+      - cntt-DEBUG:
+          DEBUG: 'true'
+      - cntt-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -325,6 +387,8 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-rmi'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
@@ -336,6 +400,8 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-pull'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-pull'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-vnf-{tag}-pull'
@@ -374,6 +440,10 @@
           projects:
             - name: 'cntt-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -382,6 +452,8 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_scenario-run'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-{tag}-tempest_slow-run'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-neutron_trunk-run'
@@ -392,6 +464,24 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *cntt-jobs
+      - multijob:
+          name: opnfv/functest-smoke-cntt:{tag}
+          condition: ALWAYS
+          projects:
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+              <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+              <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+              <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+              <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+              <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+              <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+              <<: *cntt-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{functest_tag}
           condition: ALWAYS
@@ -453,6 +543,12 @@
     parameters:
       - cntt-slave:
           slave: '{slave}'
+      - cntt-build_tag:
+          build_tag: ''
+      - cntt-DEBUG:
+          DEBUG: 'true'
+      - cntt-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -472,6 +568,8 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-rmi'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-vnf-{tag}-rmi'
@@ -483,6 +581,8 @@
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-smoke-{tag}-pull'
               <<: *cntt-jobs
+            - name: 'cntt-opnfv-functest-smoke-cntt-{tag}-pull'
+              <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-benchmarking-{tag}-pull'
               <<: *cntt-jobs
             - name: 'cntt-opnfv-functest-vnf-{tag}-pull'

diff --git a/jjb/doctor/doctor.yaml b/jjb/doctor/doctor.yaml
index c66624c..79d5262 100644 (file)
--- a/jjb/doctor/doctor.yaml
+++ b/jjb/doctor/doctor.yaml
@@ -17,8 +17,6 @@
           disabled: false
 
     installer:
-      - 'apex':
-          scenario: 'os-nosdn-nofeature-noha'
       - 'fuel':
           scenario: 'os-nosdn-nofeature-noha'
 
@@ -30,10 +28,6 @@
       - 'sample'
       - 'congress'
 
-    exclude:
-      - installer: 'apex'
-        arch: 'aarch64'
-
     jobs:
       - 'doctor-verify-{stream}'
       - 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
@@ -64,18 +58,9 @@
           # in phase jobs
           echo "Triggering phase jobs!"
       - multijob:
-          name: 'doctor-verify-sample'
+          name: 'doctor-verify-fuel'
           execution-type: PARALLEL
           projects:
-            - name: 'doctor-verify-all-apex-sample-x86_64-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              kill-phase-on: FAILURE
-              git-revision: true
             - name: 'doctor-verify-fault_management-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
@@ -85,24 +70,7 @@
                 GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
               kill-phase-on: FAILURE
               git-revision: true
-      - multijob:
-          name: 'doctor-verify-fenix'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-verify-maintenance-apex-sample-x86_64-{stream}'
-              predefined-parameters: |
-                PROJECT=$PROJECT
-                GERRIT_BRANCH=$GERRIT_BRANCH
-                GERRIT_REFSPEC=$GERRIT_REFSPEC
-                GERRIT_CHANGE_NUMBER=$GERRIT_CHANGE_NUMBER
-                GERRIT_CHANGE_COMMIT_MESSAGE=$GERRIT_CHANGE_COMMIT_MESSAGE
-              kill-phase-on: FAILURE
-              git-revision: true
-      - multijob:
-          name: 'doctor-verify-congress'
-          execution-type: PARALLEL
-          projects:
-            - name: 'doctor-verify-fault_management-apex-congress-x86_64-{stream}'
+            - name: 'doctor-verify-maintenance-fuel-sample-x86_64-{stream}'
               predefined-parameters: |
                 PROJECT=$PROJECT
                 GERRIT_BRANCH=$GERRIT_BRANCH
@@ -115,7 +83,7 @@
 - job-template:
     name: 'doctor-verify-fault_management-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
-    node: 'doctor-{installer}-{arch}'
+    node: 'zte-virtual4'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -141,7 +109,7 @@
 - job-template:
     name: 'doctor-verify-maintenance-{installer}-{inspector}-{arch}-{stream}'
     disabled: '{obj:disabled}'
-    node: 'doctor-{installer}-{arch}'
+    node: 'nokia-pod1'
     wrappers:
       - ssh-agent-wrapper
       - build-timeout:
@@ -238,7 +206,7 @@
 
           # run tox to trigger the test
           # As Jenkins user, it has no permission to send ICMP package
-          sudo -E tox -e py34
+          sudo -E tox -e py36
 
 
 # -------------------------------

diff --git a/jjb/fuel/fuel-daily-jobs.yaml b/jjb/fuel/fuel-daily-jobs.yaml
index 9a8d809..8aa2936 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: ''
 # ----------------------------------------------
@@ -524,63 +524,63 @@
     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-docker.yaml b/jjb/functest/functest-docker.yaml
index 8685ea4..a0741f1 100644 (file)
--- a/jjb/functest/functest-docker.yaml
+++ b/jjb/functest/functest-docker.yaml
@@ -37,6 +37,7 @@
       - 'benchmarking'
       - 'vnf'
       - 'smoke-cntt'
+      - 'benchmarking-cntt'
 
     exclude:
       - stream: 'master'
@@ -175,6 +176,10 @@
               <<: *build-job-settings
             - name: 'functest-smoke-cntt-docker-build-arm64-{stream}'
               <<: *build-job-settings
+            - name: 'functest-benchmarking-cntt-docker-build-amd64-{stream}'
+              <<: *build-job-settings
+            - name: 'functest-benchmarking-cntt-docker-build-arm64-{stream}'
+              <<: *build-job-settings
       - multijob:
           name: 'publish all cntt manifests'
           condition: SUCCESSFUL
@@ -182,6 +187,8 @@
           projects:
             - name: 'functest-smoke-cntt-docker-manifest-{stream}'
               <<: *manifest-job-settings
+            - name: 'functest-benchmarking-cntt-docker-manifest-{stream}'
+              <<: *manifest-job-settings
 
     publishers:
       - 'functest-amd64-recipients'

diff --git a/jjb/functest/functest-kubernetes.yaml b/jjb/functest/functest-kubernetes.yaml
index f235c4d..12c9c26 100644 (file)
--- a/jjb/functest/functest-kubernetes.yaml
+++ b/jjb/functest/functest-kubernetes.yaml
@@ -103,17 +103,14 @@
             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 \
-            $image run_tests -t {test}
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/functest-kubernetes/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            -v /home/opnfv/functest-kubernetes/.boto:/root/.boto \
+            $image run_tests -t {test} -p
 
 - builder:
     name: functest-kubernetes-remove-images

diff --git a/jjb/functest/functest.yaml b/jjb/functest/functest.yaml
index 0173c99..feb672c 100644 (file)
--- a/jjb/functest/functest.yaml
+++ b/jjb/functest/functest.yaml
@@ -39,6 +39,20 @@
           name: branch
           default: '{branch}'
 
+- parameter:
+    name: functest-DEBUG
+    parameters:
+      - string:
+          name: DEBUG
+          default: 'true'
+
+- parameter:
+    name: functest-EXTERNAL_NETWORK
+    parameters:
+      - string:
+          name: EXTERNAL_NETWORK
+          default: public
+
 - functest-containers: &functest-containers
     name: 'functest-containers'
     repo: '{repo}'
@@ -47,7 +61,7 @@
     tag: '{tag}'
 
 - functest-run-containers: &functest-run-containers
-    name: 'functest-build-containers'
+    name: 'functest-run-containers'
     <<: *functest-containers
     test: '{test}'
     dashboard_url: '{dashboard_url}'
@@ -98,7 +112,7 @@
     name: functest-run-containers
     builders:
       - shell: |
-          set +ex
+          set +x
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -117,9 +131,12 @@
             py=2.7
           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 \
             -v $WORKSPACE/../$JOB_NAME/results:/var/lib/xtesting/results \
-            -e DEBUG=True \
-            -e EXTERNAL_NETWORK=public \
+            -e DEBUG=$DEBUG \
+            -e EXTERNAL_NETWORK=$EXTERNAL_NETWORK \
             -e DASHBOARD_URL={dashboard_url} \
             -v /home/opnfv/functest/openstack.creds:/home/opnfv/functest/conf/env_file \
             -v /home/opnfv/functest/images:/home/opnfv/functest/images \
@@ -128,14 +145,8 @@
           blacklist.yaml \
             -v /home/opnfv/functest/blacklist.yaml:/usr/lib/python$py/\
           site-packages/functest/opnfv_tests/openstack/rally/blacklist.yaml \
-            $image run_tests -t {test}
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/functest/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            -v /home/opnfv/functest/.boto:/root/.boto \
+            $image run_tests -t {test} -p
 
 - builder:
     name: functest-remove-images
@@ -183,6 +194,13 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-pull'
 
+- project:
+    name: 'functest-opnfv-functest-smoke-cntt-pull'
+    <<: *functest-params
+    container: 'functest-smoke-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-pull'
+
 - project:
     name: 'functest-opnfv-functest-benchmarking-pull'
     <<: *functest-params
@@ -220,6 +238,13 @@
     jobs:
       - 'functest-{repo}-{container}-{tag}-rmi'
 
+- project:
+    name: 'functest-opnfv-functest-smoke-cntt-rmi'
+    <<: *functest-params
+    container: 'functest-smoke-cntt'
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-rmi'
+
 - project:
     name: 'functest-opnfv-functest-benchmarking-rmi'
     <<: *functest-params
@@ -239,6 +264,10 @@
     parameters:
       - functest-slave:
           slave: '{slave}'
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     builders:
       - functest-run-containers:
           <<: *functest-run-containers
@@ -273,8 +302,8 @@
     container: 'functest-smoke'
     test:
       - neutron-tempest-plugin-api
-      - tempest_keystone
       - tempest_cinder
+      - tempest_keystone
       - rally_sanity
       - refstack_defcore
       - refstack_compute
@@ -304,14 +333,23 @@
         test: refstack_object
       - tag: hunter
         test: refstack_platform
-      - tag: hunter
-        test: tempest_slow
       - tag: hunter
         test: octavia
-      - tag: hunter
-        test: tempest_keystone
-      - tag: hunter
-        test: tempest_cinder
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-{test}-run'
+
+- project:
+    name: 'functest-opnfv-functest-smoke-cntt'
+    <<: *functest-params
+    container: 'functest-smoke-cntt'
+    test:
+      - neutron-tempest-plugin-api
+      - tempest_cinder
+      - tempest_keystone
+      - rally_sanity
+      - tempest_full
+      - tempest_scenario
+      - tempest_slow
     jobs:
       - 'functest-{repo}-{container}-{tag}-{test}-run'
 
@@ -348,6 +386,10 @@
     parameters:
       - functest-slave:
           slave: '{slave}'
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -362,6 +404,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
@@ -373,6 +417,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-pull'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-pull'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-pull'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-pull'
@@ -411,10 +457,10 @@
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -443,6 +489,23 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-smoke-cntt:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
@@ -580,6 +643,16 @@
       - 'functest-{repo}-{container}-{tag}-gate'
       - 'functest-{repo}-{container}-{tag}-check'
 
+- project:
+    name: functest-opnfv-functest-smoke-cntt-{tag}-build
+    <<: *functest-params
+    container: functest-smoke-cntt
+    ref_arg: BRANCH
+    path: docker/smoke-cntt
+    jobs:
+      - 'functest-{repo}-{container}-{tag}-gate'
+      - 'functest-{repo}-{container}-{tag}-check'
+
 - job-template:
     name: 'functest-{tag}-check'
     project-type: multijob
@@ -588,6 +661,10 @@
           slave: '{slave}'
       - functest-branch:
           branch: '{branch}'
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -602,6 +679,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
@@ -637,6 +716,11 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-check'
               <<: *functest-jobs
+      - multijob:
+          name: build opnfv/functest-smoke-cntt
+          projects:
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-check'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -671,10 +755,10 @@
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -703,6 +787,23 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-smoke-cntt:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:
@@ -761,6 +862,10 @@
     parameters:
       - functest-slave:
           slave: '{slave}'
+      - functest-DEBUG:
+          DEBUG: 'true'
+      - functest-EXTERNAL_NETWORK:
+          EXTERNAL_NETWORK: public
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -775,6 +880,8 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rmi'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rmi'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-benchmarking-{tag}-rmi'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-rmi'
@@ -810,6 +917,11 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-vnf-{tag}-gate'
               <<: *functest-jobs
+      - multijob:
+          name: build opnfv/functest-smoke-cntt
+          projects:
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-gate'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{tag}
           projects:
@@ -844,10 +956,10 @@
           projects:
             - name: 'functest-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
               <<: *functest-jobs
-            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
-              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-tempest_cinder-run'
               <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-rally_sanity-run'
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-refstack_defcore-run'
@@ -876,6 +988,23 @@
               <<: *functest-jobs
             - name: 'functest-opnfv-functest-smoke-{tag}-octavia-run'
               <<: *functest-jobs
+      - multijob:
+          name: opnfv/functest-smoke-cntt:{tag}
+          projects:
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-neutron-tempest-plugin-api-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_cinder-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_keystone-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-rally_sanity-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_full-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_scenario-run'
+              <<: *functest-jobs
+            - name: 'functest-opnfv-functest-smoke-cntt-{tag}-tempest_slow-run'
+              <<: *functest-jobs
       - multijob:
           name: opnfv/functest-benchmarking:{tag}
           projects:

diff --git a/jjb/functest/xtesting.yaml b/jjb/functest/xtesting.yaml
index cc9ec07..b34fc10 100644 (file)
--- a/jjb/functest/xtesting.yaml
+++ b/jjb/functest/xtesting.yaml
@@ -93,7 +93,7 @@
     name: xtesting-run-containers
     builders:
       - shell: |
-          set +ex
+          set +x
           [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
             image={container}:{tag}
@@ -103,16 +103,13 @@
             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}
-          res=$?
-          gsutil -m cp -r $WORKSPACE/ \
-            gs://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID > /dev/null 2>&1
-          find $WORKSPACE -type f \
-            -printf \
-            "http://artifacts.opnfv.org/xtesting/$JOB_NAME-$BUILD_ID/%P\n"
-          exit $res
+            $image run_tests -t {test} -p
 
 - builder:
     name: xtesting-remove-images

diff --git a/jjb/releng/opnfv-docker.yaml b/jjb/releng/opnfv-docker.yaml
index f334c67..93788d7 100644 (file)
--- a/jjb/releng/opnfv-docker.yaml
+++ b/jjb/releng/opnfv-docker.yaml
@@ -48,6 +48,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: '.'
@@ -279,6 +285,12 @@
           dockerdir: 'docker/barometer-collectd'
           <<: *hunter
           <<: *other-receivers
+      - 'barometer-collectd-experimental':
+          project: 'barometer'
+          dockerdir: '.'
+          dockerfile: 'docker/barometer-collectd-experimental/Dockerfile'
+          <<: *gambia
+          <<: *other-receivers
       - 'barometer-collectd-master':
           project: 'barometer'
           dockerdir: '.'

diff --git a/jjb/yardstick/yardstick-project-jobs.yaml b/jjb/yardstick/yardstick-project-jobs.yaml
index 726760e..74734b8 100644 (file)
--- a/jjb/yardstick/yardstick-project-jobs.yaml
+++ b/jjb/yardstick/yardstick-project-jobs.yaml
@@ -67,9 +67,7 @@
           fail: true
 
     builders:
-      - yardstick-unit-tests-python-27
       - yardstick-unit-tests-python-3
-      - yardstick-functional-tests-python-27
       - yardstick-functional-tests-python-3
       - yardstick-coverage-tests
       - yardstick-pep8-tests
@@ -114,9 +112,7 @@
           fail: true
 
     builders:
-      - yardstick-unit-tests-python-27
       - yardstick-unit-tests-python-3
-      - yardstick-functional-tests-python-27
       - yardstick-functional-tests-python-3
       - yardstick-coverage-tests
       - yardstick-pep8-tests
@@ -125,22 +121,6 @@
 # job builders
 ################################
 
-- builder:
-    name: yardstick-unit-tests-python-27
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
-
-          sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev
-          sudo apt-get -y clean && sudo apt-get -y autoremove
-
-          echo "Running unit tests in Python 2.7 ..."
-          cd $WORKSPACE
-          tox -epy27
-
 - builder:
     name: yardstick-unit-tests-python-3
     builders:
@@ -157,30 +137,6 @@
           cd $WORKSPACE
           tox -epy3
 
-- builder:
-    name: yardstick-functional-tests-python-27
-    builders:
-      - shell: |
-          #!/bin/bash
-          set -o errexit
-          set -o pipefail
-
-          sudo apt-get -y autoremove
-          sudo apt-get install -y build-essential python-dev python3-dev rabbitmq-server
-          sudo apt-get -y clean && sudo apt-get -y autoremove
-
-          echo "Configure RabbitMQ service"
-          sudo service rabbitmq-server restart
-          sudo rabbitmqctl start_app
-          if [ -z "$(sudo rabbitmqctl list_users | grep yardstick)" ]; then
-            sudo rabbitmqctl add_user yardstick yardstick
-            sudo rabbitmqctl set_permissions yardstick ".*" ".*" ".*"
-          fi
-
-          echo "Running functional tests in Python 2.7 ..."
-          cd $WORKSPACE
-          tox -efunctional
-
 - builder:
     name: yardstick-functional-tests-python-3
     builders:

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

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

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..fc8101c
--- /dev/null
+++ b/releases/iruya/fuel.yaml
@@ -0,0 +1,17 @@
+# 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

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/tox.ini b/tox.ini
index 0cc9e23..cb6aa26 100644 (file)
--- a/tox.ini
+++ b/tox.ini
@@ -14,12 +14,14 @@ setenv=
   PYTHONPATH = {toxinidir}
 
 [testenv:jjb]
+basepython = python3
 deps =
   jenkins-job-builder==2.5.0
 commands=
   jenkins-jobs test -o job_output -r {posargs:"jjb/"}
 
 [testenv:docs]
+basepython = python3
 deps = -r{toxinidir}/docs/requirements.txt
 commands =
     sphinx-build -b html -n -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/html
@@ -27,5 +29,6 @@ commands =
 whitelist_externals = echo
 
 [testenv:docs-linkcheck]
+basepython = python3
 deps = -r{toxinidir}/docs/requirements.txt
 commands = sphinx-build -b linkcheck -d {envtmpdir}/doctrees ./docs {toxinidir}/docs/_build/linkcheck