Add testing for Ubuntu Xenial

ci/pipelines/main.yml

@@ -1,7 +1,8 @@
 groups:
 - jobs:
   - create-dev-release
-  - test-develop-integration
+  - test-integration-ubuntu-trusty
+  - test-integration-ubuntu-xenial
   - promote-to-beta
   - promote-to-rc
   - shipit
@@ -16,7 +17,7 @@ jobs:
   plan:
   - get: repo
     trigger: true
-  - task: create-de
+  - task: create-release
     file: repo/ci/tasks/create-dev-release-tarball.yml
   - put: alpha-bosh-release-tarball
     params:
@@ -25,7 +26,7 @@ jobs:
       version: release/version
     get_params:
       skip_download: true
-- name: test-develop-integration
+- name: test-integration-ubuntu-trusty
   serial: true
   plan:
   - aggregate:
@@ -37,20 +38,53 @@ jobs:
     - get: repo
       passed:
       - create-dev-release
-  - put: integration-github-status
+    - get: stemcell
+      resource: ubuntu-trusty-stemcell
+  - put: ubuntu-trusty-integration-github-status
     params:
       commit: repo
       state: pending
   - file: repo/ci/tasks/integration-test/task.yml
     task: integration-test
     privileged: true
     on_failure:
-      put: integration-github-status
+      put: ubuntu-trusty-integration-github-status
       params:
         commit: repo
         state: failure
     on_success:
-      put: integration-github-status
+      put: ubuntu-trusty-integration-github-status
+      params:
+        commit: repo
+        state: success
+- name: test-integration-ubuntu-xenial
+  serial: true
+  plan:
+  - aggregate:
+    - get: release
+      resource: alpha-bosh-release-tarball
+      trigger: true
+      passed:
+      - create-dev-release
+    - get: repo
+      passed:
+      - create-dev-release
+    - get: stemcell
+      resource: ubuntu-xenial-stemcell
+  - put: ubuntu-xenial-integration-github-status
+    params:
+      commit: repo
+      state: pending
+  - file: repo/ci/tasks/integration-test/task.yml
+    task: integration-test
+    privileged: true
+    on_failure:
+      put: ubuntu-xenial-integration-github-status
+      params:
+        commit: repo
+        state: failure
+    on_success:
+      put: ubuntu-xenial-integration-github-status
       params:
         commit: repo
         state: success
@@ -61,10 +95,12 @@ jobs:
       resource: alpha-bosh-release-tarball
       trigger: true
       passed:
-      - test-develop-integration
+      - test-integration-ubuntu-trusty
+      - test-integration-ubuntu-xenial
     - get: repo
       passed:
-      - test-develop-integration
+      - test-integration-ubuntu-trusty
+      - test-integration-ubuntu-xenial
   - put: beta-bosh-release-tarball
     params:
       metalink: release/.resource/metalink.meta4
@@ -183,13 +219,28 @@ resources:
   source:
     << : *release_artifacts
     uri: git+ssh://[email protected]:dpb587/openvpn-bosh-release.git//release/stable#artifacts
-- name: integration-github-status
+- name: ubuntu-trusty-integration-github-status
+  type: github-status
+  source:
+    access_token: ((github_access_token))
+    branch: master
+    context: ci/integration/ubuntu-trusty
+    repository: dpb587/openvpn-bosh-release
+- name: ubuntu-xenial-integration-github-status
   type: github-status
   source:
     access_token: ((github_access_token))
     branch: master
-    context: ci/integration
+    context: ci/integration/ubuntu-xenial
     repository: dpb587/openvpn-bosh-release
+- name: ubuntu-trusty-stemcell
+  type: bosh-io-stemcell
+  source:
+    name: bosh-warden-boshlite-ubuntu-trusty-go_agent
+- name: ubuntu-xenial-stemcell
+  type: bosh-io-stemcell
+  source:
+    name: bosh-warden-boshlite-ubuntu-xenial-go_agent
 resource_types:
 - name: bosh-release
   type: docker-image

ci/tasks/integration-test/deployment.yml

@@ -11,7 +11,7 @@ update:
   max_in_flight: 1
 stemcells:
 - alias: default
-  os: ubuntu-trusty
+  os: ((os))
   version: latest
 instance_groups:
 - name: role1

ci/tasks/integration-test/run.sh

@@ -10,17 +10,24 @@ start-bosh -o $PWD/ci/tasks/integration-test/bosh-ops.yml
 
 source /tmp/local-bosh/director/env
 
-bosh upload-stemcell \
-  --name=bosh-warden-boshlite-ubuntu-trusty-go_agent \
-  --version=3541.2 \
-  --sha1=314b3144192db02f29e086ffbf928792ae3789fa \
-  https://s3.amazonaws.com/bosh-core-stemcells/warden/bosh-stemcell-3541.2-warden-boshlite-ubuntu-trusty-go_agent.tgz
+if [ -e stemcell/*.tgz ]; then
+  bosh upload-stemcell stemcell/*.tgz
+  os=$( tar -Oxzf stemcell/*.tgz stemcell.MF | grep '^operating_system: ' | awk '{ print $2 }' )
+else
+  bosh upload-stemcell \
+    --name=bosh-warden-boshlite-ubuntu-trusty-go_agent \
+    --version=3586.25 \
+    --sha1=b9a44806dc1bb99b0d11d7413742f3619139da0b \
+    https://s3.amazonaws.com/bosh-core-stemcells/warden/bosh-stemcell-3586.25-warden-boshlite-ubuntu-trusty-go_agent.tgz
+  os=ubuntu-trusty
+fi
 
 export BOSH_DEPLOYMENT=integration-test
 
 bosh -n deploy \
+  --var os="$os" \
+  --var repo_dir="$PWD" \
   --vars-store=/tmp/deployment-vars.yml \
-  -v repo_dir="$PWD" \
   ci/tasks/integration-test/deployment.yml
 
 

ci/tasks/integration-test/task.yml

@@ -6,6 +6,8 @@ image_resource:
     repository: dpb587/bosh-main-bosh-docker
     tag: light
 inputs:
-  - name: repo
+- name: repo
+- name: stemcell
+  optional: true
 run:
   path: repo/ci/tasks/integration-test/run.sh

releases/openvpn/openvpn-5.1.0.md

@@ -6,3 +6,4 @@ Development
 
 * switch upgrader to use [dynamic-metalink](https://github.com/dpb587/dynamic-metalink-resource)
 * refactor pipeline to reuse [bosh-release](https://github.com/dpb587/bosh-release-resource)
+* add testing for Ubuntu Xenial stemcells