Explorar el Código

Add csh-staging to repos

Christopher Hoskin hace 8 años
padre
commit
ad8018ce0d
Se han modificado 2 ficheros con 8 adiciones y 0 borrados
  1. 6 0
      services/clsi/Jenkinsfile
  2. 2 0
      services/clsi/Makefile

+ 6 - 0
services/clsi/Jenkinsfile

@@ -36,6 +36,12 @@ pipeline {
         sh 'DOCKER_REPO=gcr.io/csh-gcdm-test make publish'
         sh 'DOCKER_REPO=gcr.io/csh-gcdm-test make publish'
         sh 'docker logout https://gcr.io/csh-gcdm-test'
         sh 'docker logout https://gcr.io/csh-gcdm-test'
         
         
+        withCredentials([file(credentialsId: 'gcr.io_csh-staging', variable: 'DOCKER_REPO_KEY_PATH')]) {
+          sh 'docker login -u _json_key --password-stdin https://gcr.io/csh-staging < ${DOCKER_REPO_KEY_PATH}'
+        }
+        sh 'DOCKER_REPO=gcr.io/csh-staging make publish'
+        sh 'docker logout https://gcr.io/csh-staging'
+        
       }
       }
     }
     }
 
 

+ 2 - 0
services/clsi/Makefile

@@ -17,6 +17,7 @@ DOCKER_COMPOSE := BUILD_NUMBER=$(BUILD_NUMBER) \
 clean:
 clean:
 	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	docker rmi ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	docker rmi gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	docker rmi gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
+	docker rmi gcr.io/csh-staging/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER)
 	rm -f app.js
 	rm -f app.js
 	rm -rf app/js
 	rm -rf app/js
 	rm -rf test/unit/js
 	rm -rf test/unit/js
@@ -38,6 +39,7 @@ test_acceptance_pre_run:
 build:
 build:
 	docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 	docker build --pull --tag ci/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		--tag gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		--tag gcr.io/csh-gcdm-test/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
+		--tag gcr.io/csh-staging/$(PROJECT_NAME):$(BRANCH_NAME)-$(BUILD_NUMBER) \
 		.
 		.
 
 
 publish:
 publish: