X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fairship.yaml;h=8ba231a39d9bd9c63cd059b5bdae8cbac29b9e62;hb=4e9d49d672614f68177b1ab3299ec2292ef476ec;hp=07671595856cbae791942d57c26d458f8b6cb193;hpb=933079028dc326c32bc3ff4d6320d6432680dca6;p=releng.git

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 076715958..8ba231a39 100644
--- 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:
@@ -276,6 +279,7 @@
       - cinder_test
       - odl
       - tempest_smoke
+      - tempest_horizon
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
@@ -284,19 +288,23 @@
     <<: *airship-params
     container: 'functest-smoke'
     test:
-      - neutron-tempest-plugin-api
+      - tempest_neutron
       - tempest_cinder
       - tempest_keystone
+      - tempest_heat
+      - tempest_telemetry
       - rally_sanity
-      - refstack_defcore
+      - refstack_compute
+      - refstack_object
+      - refstack_platform
       - tempest_full
       - tempest_scenario
       - tempest_slow
       - patrole
-      - neutron_trunk
       - networking-bgpvpn
       - networking-sfc
-      - barbican
+      - tempest_barbican
+      - tempest_octavia
     jobs:
       - 'airship-{repo}-{container}-{tag}-{test}-run'
 
@@ -338,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
@@ -369,7 +381,7 @@
     name: 'airship-{tag}-daily'
     project-type: multijob
     triggers:
-      - timed: '@daily'
+      - timed: '0 6 * * 3,6'
     parameters:
       - airship-slave:
           slave: '{slave}'
@@ -443,19 +455,29 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_horizon-run'
+              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-smoke:{functest_tag}
           condition: ALWAYS
           projects:
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_neutron-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_cinder-run'
+              <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_keystone-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_cinder-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-tempest_heat-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest_keystone-run'
+            - 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_platform-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *airship-jobs
@@ -465,13 +487,13 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-patrole-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-neutron_trunk-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}-barbican-run'
+            - 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}
@@ -563,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:
@@ -574,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'
@@ -597,42 +607,14 @@
               <<: *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'
+            - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-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}-neutron_trunk-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}-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: