Commit 5bedf473 authored by Pablo Panero's avatar Pablo Panero
Browse files

Fix: Auto-import image in dev openshift

parent c50f8403
...@@ -85,11 +85,9 @@ tag_image_prod: ...@@ -85,11 +85,9 @@ tag_image_prod:
########## DEV ########## ########## DEV ##########
### Import image into OpenShift. Import $CI_COMMIT_TAG if present or 'latest' if not. ### Import image into OpenShift. Import $CI_COMMIT_TAG if present or 'latest' if not.
import_image_dev: &import_image_openshift import_image_dev:
stage: import_image stage: import_image
environment: staging environment: staging
only:
- tags
image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
script: script:
- oc import-image ${RESOURCE}:${CI_COMMIT_TAG:-latest} --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE} - oc import-image ${RESOURCE}:${CI_COMMIT_TAG:-latest} --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE}
...@@ -101,7 +99,13 @@ import_image_dev: &import_image_openshift ...@@ -101,7 +99,13 @@ import_image_dev: &import_image_openshift
########## PROD ########## ########## PROD ##########
### Import image into OpenShift. Import $CI_COMMIT_TAG if present or 'latest' if not. ### Import image into OpenShift. Import $CI_COMMIT_TAG if present or 'latest' if not.
import_image_prod: import_image_prod:
<<: *import_image_openshift stage: import_image
environment: master
only:
- tags
image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
script:
- oc import-image ${RESOURCE}:${CI_COMMIT_TAG:-latest} --token=${TOKEN} --server=${OPENSHIFT_SERVER} -n ${NAMESPACE}
variables: variables:
TOKEN: ${SERVICE_ACCOUNT_TOKEN_PROD} TOKEN: ${SERVICE_ACCOUNT_TOKEN_PROD}
NAMESAPCE: ${NAMESPACE_PROD} NAMESAPCE: ${NAMESPACE_PROD}
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment