Code Review / releng.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | review | tree
raw | inline | side by side
StorPerf Iruya Docker Builds
[releng.git] / jjb / airship / cntt.yaml
diff --git a/jjb/airship/cntt.yaml b/jjb/airship/cntt.yaml
index dd2d6ee..f39ea42 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/$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 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
@@ -172,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
@@ -209,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
@@ -228,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
@@ -258,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
@@ -270,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
@@ -303,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
@@ -324,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'
@@ -335,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'
@@ -373,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'
@@ -381,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'
@@ -391,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
@@ -445,12 +536,19 @@
 - job-template:
     name: 'cntt-{tag}-gate'
     project-type: multijob
+    disabled: true
     triggers:
       - cntt-patchset-created:
           branch: '{branch}'
     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
@@ -470,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'
@@ -481,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'