X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=jjb%2Fairship%2Fairship.yaml;h=74942562acd18fce6fc376e3a6a0df5eee6153e6;hb=3f7a34a7a14c0a958a7a86a6fb5f730de365cb84;hp=d577b20b9d42ba65b5b2649218d23f176a60ae1d;hpb=702a7da4b40e23c1e8552dcf0021b0649ed8b437;p=releng.git

diff --git a/jjb/airship/airship.yaml b/jjb/airship/airship.yaml
index d577b20b9..74942562a 100644
--- a/jjb/airship/airship.yaml
+++ b/jjb/airship/airship.yaml
@@ -8,9 +8,10 @@
     repo: 'opnfv'
     port:
     tag:
-      - hunter:
-          branch: stable/hunter
+      - latest:
+          branch: master
           slave: intel-pod17
+          functest_tag: hunter
 
 - parameter:
     name: airship-slave
@@ -19,19 +20,12 @@
           name: slave
           default: '{slave}'
 
-- parameter:
-    name: airship-branch
-    parameters:
-      - string:
-          name: branch
-          default: '{branch}'
-
 - airship-containers: &airship-containers
     name: 'airship-containers'
     repo: '{repo}'
     port: '{port}'
     container: '{container}'
-    tag: '{tag}'
+    functest_tag: '{functest_tag}'
 
 - airship-run-containers: &airship-run-containers
     name: 'airship-run-containers'
@@ -44,28 +38,28 @@
       - shell: |
           set +x
           if [ "{repo}" = "_" ]; then
-            image={container}:{tag}
+            image={container}:{functest_tag}
           elif [ "{port}" = "None" ]; then
-            image={repo}/{container}:{tag}
+            image={repo}/{container}:{functest_tag}
           else
-            image={repo}:{port}/{container}:{tag}
+            image={repo}:{port}/{container}:{functest_tag}
           fi
-          docker pull $image
+          sudo docker pull $image
 
 - builder:
     name: airship-run-containers
     builders:
       - shell: |
           set +ex
-          [ ! -z "$WORKSPACE" ] && rm -rf $WORKSPACE/* || true
+          [ ! -z "$WORKSPACE" ] && sudo rm -rf $WORKSPACE/* || true
           if [ "{repo}" = "_" ]; then
-            image={container}:{tag}
+            image={container}:{functest_tag}
           elif [ "{port}" = "None" ]; then
-            image={repo}/{container}:{tag}
+            image={repo}/{container}:{functest_tag}
           else
-            image={repo}:{port}/{container}:{tag}
+            image={repo}:{port}/{container}:{functest_tag}
           fi
-          docker run --rm \
+          sudo docker run --rm \
             -e TEST_DB_URL=http://testresults.opnfv.org/test/api/v1/results \
             -e NODE_NAME=intel-pod17 \
             -e INSTALLER_TYPE=airship \
@@ -91,14 +85,55 @@
       - shell: |
           set +x
           if [ "{repo}" = "_" ]; then
-            image={container}:{tag}
+            image={container}:{functest_tag}
           elif [ "{port}" = "None" ]; then
-            image={repo}/{container}:{tag}
+            image={repo}/{container}:{functest_tag}
           else
-            image={repo}:{port}/{container}:{tag}
+            image={repo}:{port}/{container}:{functest_tag}
           fi
-          docker rmi $image || true
+          sudo docker rmi $image || true
 
+- builder:
+    name: airship-deploy
+    builders:
+      - shell: |
+          set +x
+          tools/deploy.sh deploy_site
+
+- scm:
+    name: airship-scm
+    scm:
+      - git:
+          url: https://gerrit.opnfv.org/gerrit/airship
+          refspec: '+refs/changes/*:refs/changes/*'
+          branches:
+            - '{ref}'
+
+- parameter:
+    name: airship-branch
+    parameters:
+      - string:
+          name: branch
+          default: '{branch}'
+
+- job-template:
+    name: 'airship-deploy-{tag}'
+    parameters:
+      - airship-slave:
+          slave: '{slave}'
+      - airship-branch:
+          branch: '{branch}'
+    scm:
+      - airship-scm:
+          ref: $branch
+    builders:
+      - airship-deploy
+
+- project:
+    name: 'airship-deploy'
+    <<: *airship-params
+    jobs:
+      - 'airship-deploy-{tag}'
 
 - job-template:
     name: 'airship-{repo}-{container}-{tag}-pull'
@@ -281,6 +316,8 @@
     parameters:
       - airship-slave:
           slave: '{slave}'
+      - airship-branch:
+          branch: 'master'
     properties:
       - build-blocker:
           use-build-blocker: true
@@ -288,6 +325,11 @@
           blocking-jobs:
             - '^airship-{tag}-(daily|check|gate)$'
     builders:
+      - multijob:
+          name: deploy
+          projects:
+            - name: 'airship-deploy-latest'
+              <<: *airship-jobs
       - multijob:
           name: remove former images
           projects:
@@ -315,7 +357,7 @@
             - name: 'airship-opnfv-functest-features-{tag}-pull'
               <<: *airship-jobs
       - multijob:
-          name: opnfv/functest-healthcheck:{tag}
+          name: opnfv/functest-healthcheck:{functest_tag}
           condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-healthcheck-{tag}-connection_check-run'
@@ -343,7 +385,7 @@
             - name: 'airship-opnfv-functest-healthcheck-{tag}-tempest_smoke-run'
               <<: *airship-jobs
       - multijob:
-          name: opnfv/functest-smoke:{tag}
+          name: opnfv/functest-smoke:{functest_tag}
           condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-smoke-{tag}-neutron-tempest-plugin-api-run'
@@ -367,7 +409,7 @@
             - name: 'airship-opnfv-functest-smoke-{tag}-barbican-run'
               <<: *airship-jobs
       - multijob:
-          name: opnfv/functest-benchmarking:{tag}
+          name: opnfv/functest-benchmarking:{functest_tag}
           condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-benchmarking-{tag}-rally_full-run'
@@ -379,7 +421,7 @@
             - name: 'airship-opnfv-functest-benchmarking-{tag}-shaker-run'
               <<: *airship-jobs
       - multijob:
-          name: opnfv/functest-vnf:{tag}
+          name: opnfv/functest-vnf:{functest_tag}
           condition: ALWAYS
           execution-type: SEQUENTIALLY
           projects:
@@ -394,7 +436,7 @@
             - name: 'airship-opnfv-functest-vnf-{tag}-juju_epc-run'
               <<: *airship-jobs
       - multijob:
-          name: opnfv/functest-features:{tag}
+          name: opnfv/functest-features:{functest_tag}
           condition: ALWAYS
           projects:
             - name: 'airship-opnfv-functest-features-{tag}-doctor-notification-run'
@@ -408,7 +450,6 @@
             - name: 'airship-opnfv-functest-features-{tag}-stor4nfv_os-run'
               <<: *airship-jobs
 
-
 - project:
     name: 'airship'
     <<: *airship-params