Add -container-runtime containerd in e2e.tests

[releng.git] / jjb / airship / airship.yaml

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index 937daa8..8ba231a 100644 (file)
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -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:
@@ -376,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}'
@@ -475,7 +477,7 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-refstack_object-run'
               <<: *airship-jobs
-            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_plateform-run'
+            - name: 'airship-opnfv-functest-smoke-{tag}-refstack_platform-run'
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-smoke-{tag}-tempest_full-run'
               <<: *airship-jobs
@@ -551,7 +553,6 @@
 
 - job-template:
     name: 'airship-{tag}-gate'
-    disabled: true
     project-type: multijob
     triggers:
       - airship-patchset-created:
@@ -582,11 +583,15 @@
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-rmi'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-rmi'
+              <<: *airship-jobs
       - multijob:
           name: pull containers
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-pull'
               <<: *airship-jobs
+            - name: 'airship-opnfv-functest-smoke-{tag}-pull'
+              <<: *airship-jobs
       - multijob:
           name: opnfv/functest-healthcheck:{functest_tag}
           projects:
@@ -604,6 +609,13 @@
               <<: *airship-jobs
             - name: 'airship-opnfv-functest-healthcheck-{tag}-cinder_test-run'
               <<: *airship-jobs
+            - 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_keystone-run'
+              <<: *airship-jobs
 
 - project:
     name: 'airship'