From 9a69bcaf7c932c1ba9614563f09dfb9fda62e709 Mon Sep 17 00:00:00 2001
From: Gavin Mogan <git@gavinmogan.com>
Date: Thu, 6 Jan 2022 00:11:46 -0800
Subject: [PATCH] Use latest builder image with yarn properly setup -
 https://github.com/jenkins-infra/helpdesk/issues/4

---
 Jenkinsfile_k8s | 15 +--------------
 1 file changed, 1 insertion(+), 14 deletions(-)

diff --git a/Jenkinsfile_k8s b/Jenkinsfile_k8s
index 379ce85ed..c52a8f30c 100644
--- a/Jenkinsfile_k8s
+++ b/Jenkinsfile_k8s
@@ -53,8 +53,7 @@ spec:
   automountServiceAccountToken: false
   containers:
     - name: "jnlp"
-      image: "jenkinsciinfra/builder"
-      imagePullPolicy: Always
+      image: "jenkinsciinfra/builder:2.0.3"
       resources:
         limits: {}
         requests:
@@ -68,8 +67,6 @@ spec:
     TZ = "UTC"
     GET_CONTENT = "true"
     NODE_ENV = "production"
-    HOME = "/tmp"
-    PATH = "/tmp/.npm-packages/bin:/opt/java/openjdk/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin"
   }
 
   triggers {
@@ -84,16 +81,6 @@ spec:
   }
 
   stages {
-    stage('Setup NPM and Yarn') {
-      steps {
-        sh '''
-          mkdir "${HOME}/.npm-packages"
-          npm config set prefix "${HOME}/.npm-packages"
-          npm install --global yarn
-        '''
-      }
-    }
-
     stage('NPM Install') {
       steps {
         sh 'NODE_ENV=development yarn install'