Merge pull request #12 from pydevops/dev

use scripted Jenkinsfile to solve version bump issue

Author: chrislovecnm

Jenkinsfile

@@ -1,3 +1,4 @@
+#!/usr/bin/env groovy
 /*
 Copyright 2018 Google LLC
 
@@ -19,109 +20,87 @@ limitations under the License.
 // define containerTemplate but that has been deprecated in favor of the yaml
 // format
 // Reference: https://github.com/jenkinsci/kubernetes-plugin
-pipeline {
-  agent {
-    kubernetes {
-      label 'k8s-infra'
-      defaultContainer 'jnlp'
-      yaml """
+
+// set up pod label and GOOGLE_APPLICATION_CREDENTIALS (for Terraform)
+def label = "k8s-infra"
+def containerName = "k8s-node"
+def GOOGLE_APPLICATION_CREDENTIALS    = '/home/jenkins/dev/jenkins-deploy-dev-infra.json'
+
+podTemplate(label: label, yaml: """
 apiVersion: v1
 kind: Pod
 metadata:
   labels:
     jenkins: build-node
 spec:
   containers:
-  - name: k8s-node
-    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:1.2.0
-    imagePullPolicy: Always
-    command:
-    - cat
+  - name: ${containerName}
+    image: gcr.io/pso-helmsman-cicd/jenkins-k8s-node:${env.CONTAINER_VERSION}
+    command: ['cat']
     tty: true
     volumeMounts:
-    # Mount the docker.sock file so we can communicate wth the local docker
-    # daemon
-    - name: docker-sock-volume
-      mountPath: /var/run/docker.sock
-    # Mount the local docker binary
-    - name: docker-bin-volume
-      mountPath: /usr/bin/docker
     # Mount the dev service account key
     - name: dev-key
       mountPath: /home/jenkins/dev
   volumes:
-  - name: docker-sock-volume
-    hostPath:
-      path: /var/run/docker.sock
-  - name: docker-bin-volume
-    hostPath:
-      path: /usr/bin/docker
   # Create a volume that contains the dev json key that was saved as a secret
   - name: dev-key
     secret:
       secretName: jenkins-deploy-dev-infra
 """
-    }
-  }
-
-  environment {
-        GOOGLE_APPLICATION_CREDENTIALS    = '/home/jenkins/dev/jenkins-deploy-dev-infra.json'
-    }
+ ) {
+ node(label) {
+  try {
+    // Options covers all other job properties or wrapper functions that apply to entire Pipeline.
+    properties([disableConcurrentBuilds()])
+    // set env variable GOOGLE_APPLICATION_CREDENTIALS for Terraform
+    env.GOOGLE_APPLICATION_CREDENTIALS=GOOGLE_APPLICATION_CREDENTIALS
 
+    stage('Setup') {
+        container(containerName) {
+          // checkout code from scm i.e. commits related to the PR
+          checkout scm
 
-  stages {
-    stage('Setup access') {
-      steps {
-        container('k8s-node') {
-          script {
-            // env.CLUSTER_ZONE will need to be updated to match the
-            // ZONE in the jenkins.propeties file
-            env.CLUSTER_ZONE = "${CLUSTER_ZONE}"
-            // env.PROJECT_ID will need to be updated to match your GCP
-            // development project id
-            env.PROJECT_ID = "${PROJECT_ID}"
-            env.REGION = "${REGION}"
-          }
           // Setup gcloud service account access
-          sh "gcloud auth activate-service-account --key-file=${env.GOOGLE_APPLICATION_CREDENTIALS}"
+          sh "gcloud auth activate-service-account --key-file=${GOOGLE_APPLICATION_CREDENTIALS}"
           sh "gcloud config set compute/zone ${env.CLUSTER_ZONE}"
           sh "gcloud config set core/project ${env.PROJECT_ID}"
           sh "gcloud config set compute/region ${env.REGION}"
          }
-        }
     }
-
-    stage('Code linting') {
-      steps {
-        container('k8s-node') {
-          sh "make linting"
-        }
+    stage('Lint') {
+        container(containerName) {
+          sh "make lint"
       }
     }
 
     stage('Create') {
-      steps {
-        container('k8s-node') {
+        container(containerName) {
           sh "make create"
         }
-      }
     }
 
     stage('Validate') {
-      steps {
-        container('k8s-node') {
+        container(containerName) {
           sh "make validate"
         }
-      }
     }
-  }
 
-  post {
-    always {
-      container('k8s-node') {
-        sh 'make teardown'
-        sh 'gcloud auth revoke'
+  }
+   catch (err) {
+      // if any exception occurs, mark the build as failed
+      // and display a detailed message on the Jenkins console output
+      currentBuild.result = 'FAILURE'
+      echo "FAILURE caught echo ${err}"
+      throw err
+   }
+   finally {
+     stage('Teardown') {
+      container(containerName) {
+        sh "make teardown"
+        sh "gcloud auth revoke"
       }
-    }
+     }
+   }
   }
-}
+}

Makefile

@@ -16,7 +16,7 @@
 SHELL := /usr/bin/env bash
 
 # All is the first target in the file so it will get picked up when you just run 'make' on its own
-linting: check_shell check_python check_golang check_terraform check_docker check_base_files check_headers check_trailing_whitespace
+lint: check_shell check_python check_golang check_terraform check_docker check_base_files check_headers check_trailing_whitespace
 
 # The .PHONY directive tells make that this isn't a real target and so
 # the presence of a file named 'check_shell' won't cause this target to stop