Add env to dockercopy

Signed-off-by: Sayali Gaikawad <gaiksaya@amazon.com>
opensearch-project · Jul 9, 2022 · 3eff6ba · 3eff6ba
1 parent 61fd27f
commit 3eff6ba
Show file tree

Hide file tree

Showing 7 changed files with 15 additions and 6 deletions.
diff --git a/jenkins/docker/docker-copy.jenkinsfile b/jenkins/docker/docker-copy.jenkinsfile
@@ -4,10 +4,13 @@ pipeline {
     options {
         timeout(time: 30)
     }
-    agent none  
+    agent none
+    environment {
+        DATA_PREPPER_STAGING_CONTAINER_REPOSITORY = credentials('jenkins-data-prepper-staging-container-repository')
+    }
     parameters {
         choice(
-            name: 'SOURCE_IMAGE_REGISTRY', 
+            name: 'SOURCE_IMAGE_REGISTRY',
             choices: ['opensearchstaging', 'public.ecr.aws/opensearchstaging', 'opensearchproject', 'public.ecr.aws/opensearchproject', "${DATA_PREPPER_STAGING_CONTAINER_REPOSITORY}"],
             description: 'Choose the source image registry'
         )
@@ -17,7 +20,7 @@ pipeline {
             trim: true
         )
         choice(
-            name: 'DESTINATION_IMAGE_REGISTRY', 
+            name: 'DESTINATION_IMAGE_REGISTRY',
             choices: ['opensearchstaging', 'public.ecr.aws/opensearchstaging', 'opensearchproject', 'public.ecr.aws/opensearchproject'],
             description: 'Choose the destination image registry'
         )
@@ -28,7 +31,7 @@ pipeline {
         )
     }
     stages {
-        stage("Image Copy") {
+        stage('Image Copy') {
             agent {
                     docker {
                         label 'Jenkins-Agent-al2-x64-c54xlarge-Docker-Host'
@@ -60,15 +63,15 @@ pipeline {
                         }
                     }
                 }
-            }  
+            }
             post() {
                 always {
                     script {
                         postCleanup()
                         sh "docker logout ${DESTINATION_IMAGE_REGISTRY} && docker image prune -f --all"
                     }
                 }
-            }     
+            }
         }
     }
 }
diff --git a/...-regression-files/docker/docker-copy-testCopyContainerDockerProdtoEcrProd.jenkinsfile.txt b/...-regression-files/docker/docker-copy-testCopyContainerDockerProdtoEcrProd.jenkinsfile.txt
@@ -2,6 +2,7 @@
       docker-copy.legacySCM(groovy.lang.Closure)
       docker-copy.library({identifier=jenkins@20211123, retriever=null})
       docker-copy.pipeline(groovy.lang.Closure)
+         docker-copy.credentials(jenkins-data-prepper-staging-container-repository)
          docker-copy.timeout({time=30})
          docker-copy.echo(Executing on agent [label:none])
          docker-copy.stage(Parameters Check, groovy.lang.Closure)

diff --git a/...ssion-files/docker/docker-copy-testCopyContainerDockerStagingToDockerProd.jenkinsfile.txt b/...ssion-files/docker/docker-copy-testCopyContainerDockerStagingToDockerProd.jenkinsfile.txt
@@ -2,6 +2,7 @@
       docker-copy.legacySCM(groovy.lang.Closure)
       docker-copy.library({identifier=jenkins@20211123, retriever=null})
       docker-copy.pipeline(groovy.lang.Closure)
+         docker-copy.credentials(jenkins-data-prepper-staging-container-repository)
          docker-copy.timeout({time=30})
          docker-copy.echo(Executing on agent [label:none])
          docker-copy.stage(Parameters Check, groovy.lang.Closure)

diff --git a/...gression-files/docker/docker-copy-testCopyContainerDockerStagingToEcrProd.jenkinsfile.txt b/...gression-files/docker/docker-copy-testCopyContainerDockerStagingToEcrProd.jenkinsfile.txt
@@ -2,6 +2,7 @@
       docker-copy.legacySCM(groovy.lang.Closure)
       docker-copy.library({identifier=jenkins@20211123, retriever=null})
       docker-copy.pipeline(groovy.lang.Closure)
+         docker-copy.credentials(jenkins-data-prepper-staging-container-repository)
          docker-copy.timeout({time=30})
          docker-copy.echo(Executing on agent [label:none])
          docker-copy.stage(Parameters Check, groovy.lang.Closure)

diff --git a/...ssion-files/docker/docker-copy-testCopyContainerDockerStagingtoEcrStaging.jenkinsfile.txt b/...ssion-files/docker/docker-copy-testCopyContainerDockerStagingtoEcrStaging.jenkinsfile.txt
@@ -2,6 +2,7 @@
       docker-copy.legacySCM(groovy.lang.Closure)
       docker-copy.library({identifier=jenkins@20211123, retriever=null})
       docker-copy.pipeline(groovy.lang.Closure)
+         docker-copy.credentials(jenkins-data-prepper-staging-container-repository)
          docker-copy.timeout({time=30})
          docker-copy.echo(Executing on agent [label:none])
          docker-copy.stage(Parameters Check, groovy.lang.Closure)

diff --git a/...gression-files/docker/docker-copy-testCopyContainerECRStagingtoDockerProd.jenkinsfile.txt b/...gression-files/docker/docker-copy-testCopyContainerECRStagingtoDockerProd.jenkinsfile.txt
@@ -2,6 +2,7 @@
       docker-copy.legacySCM(groovy.lang.Closure)
       docker-copy.library({identifier=jenkins@20211123, retriever=null})
       docker-copy.pipeline(groovy.lang.Closure)
+         docker-copy.credentials(jenkins-data-prepper-staging-container-repository)
          docker-copy.timeout({time=30})
          docker-copy.echo(Executing on agent [label:none])
          docker-copy.stage(Parameters Check, groovy.lang.Closure)

diff --git a/...-regression-files/docker/docker-copy-testCopyContainerEcrStagingtoEcrProd.jenkinsfile.txt b/...-regression-files/docker/docker-copy-testCopyContainerEcrStagingtoEcrProd.jenkinsfile.txt
@@ -2,6 +2,7 @@
       docker-copy.legacySCM(groovy.lang.Closure)
       docker-copy.library({identifier=jenkins@20211123, retriever=null})
       docker-copy.pipeline(groovy.lang.Closure)
+         docker-copy.credentials(jenkins-data-prepper-staging-container-repository)
          docker-copy.timeout({time=30})
          docker-copy.echo(Executing on agent [label:none])
          docker-copy.stage(Parameters Check, groovy.lang.Closure)