Jenkins 2.67 (#88)

* Use Jenkins 2.67 * Update PR pipeline with new paths * Remove daily triggers * Use merged code for testing
GoogleCloudPlatform · Jul 17, 2017 · e0c7b09 · e0c7b09
1 parent 0ef71f3
commit e0c7b09
Show file tree

Hide file tree

Showing 2 changed files with 44 additions and 35 deletions.
diff --git a/jenkins/k8s/jenkins.yaml b/jenkins/k8s/jenkins.yaml
@@ -26,7 +26,7 @@ spec:
     spec:
       containers:
       - name: master
-        image: jenkins:2.7.2
+        image: jenkinsci/jenkins:2.67
         ports:
         - containerPort: 8080
         - containerPort: 50000

diff --git a/tests/pipelines/cd-on-k8s-prs.yaml b/tests/pipelines/cd-on-k8s-prs.yaml
@@ -2,7 +2,7 @@ resource_types:
 - name: pull-request
   type: docker-image
   source:
-    repository: viglesiasce/pr-resource
+    repository: jtarchie/pr
 resources:
 - name: continuous-deployment-on-kubernetes
   type: pull-request
@@ -11,58 +11,67 @@ resources:
     repo: googlecloudplatform/continuous-deployment-on-kubernetes
     label: ok-to-test
 jobs:
-- name: run-tutorial
+- name: test-tutorial
   serial: true
   plan:
-  - get: continuous-deployment-on-kubernetes
-    trigger: true
-    params:
-      fetch_merge: true
-  - put: continuous-deployment-on-kubernetes
-    params:
-      path: continuous-deployment-on-kubernetes
-      status: pending
-      context: concourse-ci/running-tutorial
-  - task: run-tutorial
-    params:
-      service_account_json: {{service_account_json}}
-      project_id: {{project_id}}
-      zone: us-east1-d
-    on_success:
-      put: continuous-deployment-on-kubernetes
+  - do:
+    - get: continuous-deployment-on-kubernetes
+      trigger: true
       params:
-        path: continuous-deployment-on-kubernetes
-        status: success
-        context: concourse-ci/running-tutorial
-    on_failure:
-      put: continuous-deployment-on-kubernetes
+        fetch_merge: true
+    - task: install-jenkins
       params:
-        path: continuous-deployment-on-kubernetes
-        status: failure
-        context: concourse-ci/running-tutorial
-    file: continuous-deployment-on-kubernetes/tests/tasks/run-tutorial.yaml
+        service_account_json: {{service_account_json}}
+        project_id: {{project_id}}
+        zone: us-east1-d
+      on_success:
+        put: continuous-deployment-on-kubernetes
+        params:
+          path: continuous-deployment-on-kubernetes
+          status: success
+          context: concourse-ci/install-jenkins
+      on_failure:
+        put: continuous-deployment-on-kubernetes
+        params:
+          path: continuous-deployment-on-kubernetes
+          status: failure
+          context: concourse-ci/install-jenkins
+      file: continuous-deployment-on-kubernetes/tests/tasks/install-jenkins.yaml
+    - task: deploy-sample-app
+      params:
+        service_account_json: {{service_account_json}}
+        project_id: {{project_id}}
+        zone: us-east1-d
+      on_success:
+        put: continuous-deployment-on-kubernetes
+        params:
+          path: continuous-deployment-on-kubernetes
+          status: success
+          context: concourse-ci/deploy-app
+      on_failure:
+        put: continuous-deployment-on-kubernetes
+        params:
+          path: continuous-deployment-on-kubernetes
+          status: failure
+          context: concourse-ci/deploy-app
+      file: continuous-deployment-on-kubernetes/tests/tasks/deploy-sample-app.yaml
 - name: build-sample-app
   plan:
   - get: continuous-deployment-on-kubernetes
     trigger: true
     params:
       fetch_merge: true
-  - put: continuous-deployment-on-kubernetes
-    params:
-      path: continuous-deployment-on-kubernetes
-      status: pending
-      context: concourse-ci/building-sample-app
   - task: run-sample-app
     file: continuous-deployment-on-kubernetes/tests/tasks/build-sample-app.yaml
     on_success:
       put: continuous-deployment-on-kubernetes
       params:
-        context: concourse-ci/building-sample-app
         path: continuous-deployment-on-kubernetes
         status: success
+        context: concourse-ci/build-sample-app
     on_failure:
       put: continuous-deployment-on-kubernetes
       params:
-        context: concourse-ci/building-sample-app
         path: continuous-deployment-on-kubernetes
         status: failure
+        context: concourse-ci/build-sample-app