From 58779b426badfeecae3a67498cc3643d665d06ba Mon Sep 17 00:00:00 2001
From: Kawika Avilla <kavilla414@gmail.com>
Date: Mon, 28 Feb 2022 09:52:57 +0000
Subject: [PATCH] [Dashboards] Permissions for JOB_BASE_NAME and docker

Signed-off-by: Kawika Avilla <kavilla414@gmail.com>
---
 jenkins/opensearch-dashboards/distribution-build.jenkinsfile | 2 +-
 jenkins/opensearch-dashboards/integ-test.jenkinsfile         | 4 +++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
index 9e755743f5..115268132d 100644
--- a/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
+++ b/jenkins/opensearch-dashboards/distribution-build.jenkinsfile
@@ -3,7 +3,7 @@ lib = library(identifier: 'jenkins@20211123', retriever: legacySCM(scm))
 pipeline {
     options {
         timeout(time: 3, unit: 'HOURS')
-        copyArtifactPermission("${JOB_NAME}")
+        copyArtifactPermission("${JOB_BASE_NAME}")
         buildDiscarder(logRotator(artifactNumToKeepStr: '1'))
     }
     agent none
diff --git a/jenkins/opensearch-dashboards/integ-test.jenkinsfile b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
index 95ffb3f916..28245650fd 100644
--- a/jenkins/opensearch-dashboards/integ-test.jenkinsfile
+++ b/jenkins/opensearch-dashboards/integ-test.jenkinsfile
@@ -48,8 +48,10 @@ pipeline {
         }
         stage('download-manifest') {
             agent {
-                node {
+                docker {
                     label AGENT_LABEL
+                    image AGENT_IMAGE
+                    alwaysPull true
                 }
             }
             steps {