pingu_98/cara
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fixes to deploy test to OKD4 and prod to OKD3

Browse source
This commit is contained in:
Nicola Tarocco 2021-12-21 11:55:30 +01:00
parent eae34e95eb
commit dfef879611
1 changed files with 19 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

28
.gitlab-ci.yml
View file

@ -1,3 +1,9 @@
stages:
- test
- docker-build
- oc-tag
- deploy
# Use the acc-py-devtools templates found at # Use the acc-py-devtools templates found at
# https://gitlab.cern.ch/-/ide/project/acc-co/devops/python/acc-py-devtools/blob/master/-/acc_py_devtools/templates/gitlab-ci/python.yml. # https://gitlab.cern.ch/-/ide/project/acc-co/devops/python/acc-py-devtools/blob/master/-/acc_py_devtools/templates/gitlab-ci/python.yml.
include: include:
@ -83,14 +89,17 @@ check_openshift_config_prod:
.image_builder: .image_builder:
# Build and push images to the openshift instance, which automatically triggers an application re-deployment. # Build and push images to the openshift instance, which automatically triggers an application re-deployment.
stage: deploy stage: docker-build
rules: rules:
- if: '$CI_COMMIT_BRANCH == "live/test-cara"' - if: '$CI_COMMIT_BRANCH == "live/test-cara"'
variables: variables:
DOCKER_REGISTRY: $CI_REGISTRY_IMAGE
IMAGE_TAG: test-cara-latest IMAGE_TAG: test-cara-latest
- if: '$CI_COMMIT_BRANCH == "master"' - if: '$CI_COMMIT_BRANCH == "master"'
variables: variables:
IMAGE_TAG: cara-latest DOCKER_REGISTRY: $DOCKER_REGISTRY
# change to `cara-latest` after moving prod to OKD4
IMAGE_TAG: latest
image: image:
# Based on guidance at https://gitlab.cern.ch/gitlabci-examples/build_docker_image. # Based on guidance at https://gitlab.cern.ch/gitlabci-examples/build_docker_image.
name: gitlab-registry.cern.ch/ci-tools/docker-image-builder name: gitlab-registry.cern.ch/ci-tools/docker-image-builder
@ -98,7 +107,7 @@ check_openshift_config_prod:
script: script:
- echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json - echo "{\"auths\":{\"$CI_REGISTRY\":{\"username\":\"$CI_REGISTRY_USER\",\"password\":\"$CI_REGISTRY_PASSWORD\"}}}" > /kaniko/.docker/config.json
- echo "Building ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest Docker image..." - echo "Building ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest Docker image..."
- /kaniko/executor --context ${CI_PROJECT_DIR}/${DOCKER_CONTEXT_DIRECTORY} --dockerfile ${CI_PROJECT_DIR}/${DOCKERFILE_DIRECTORY}/Dockerfile --destination ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:${IMAGE_TAG} - /kaniko/executor --context ${CI_PROJECT_DIR}/${DOCKER_CONTEXT_DIRECTORY} --dockerfile ${CI_PROJECT_DIR}/${DOCKERFILE_DIRECTORY}/Dockerfile --destination ${DOCKER_REGISTRY}/${IMAGE_NAME}:${IMAGE_TAG}
auth-service-image_builder: auth-service-image_builder:
@ -132,7 +141,7 @@ oci_calculator:
# Link build Docker images OpenShift <-> GitLab registry # Link build Docker images OpenShift <-> GitLab registry
.link_docker_images_with_gitlab_registry: .link_docker_images_with_gitlab_registry:
stage: deploy stage: oc-tag
image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest image: gitlab-registry.cern.ch/paas-tools/openshift-client:latest
rules: rules:
- if: '$CI_COMMIT_BRANCH == "live/test-cara"' - if: '$CI_COMMIT_BRANCH == "live/test-cara"'
@ -140,11 +149,12 @@ oci_calculator:
OC_SERVER: "https://api.paas.okd.cern.ch" OC_SERVER: "https://api.paas.okd.cern.ch"
OC_PROJECT: "test-cara" OC_PROJECT: "test-cara"
OC_TOKEN: ${OPENSHIFT_CARA_TEST_DEPLOY_TOKEN} OC_TOKEN: ${OPENSHIFT_CARA_TEST_DEPLOY_TOKEN}
- if: '$CI_COMMIT_BRANCH == "master"' # UNCOMMENT when prod migrated to OKD4
variables: # - if: '$CI_COMMIT_BRANCH == "master"'
OC_SERVER: "https://openshift.cern.ch" # variables:
OC_PROJECT: "cara" # OC_SERVER: "https://openshift.cern.ch"
OC_TOKEN: ${OPENSHIFT_CARA_DEPLOY_TOKEN} # OC_PROJECT: "cara"
# OC_TOKEN: ${OPENSHIFT_CARA_DEPLOY_TOKEN}
script: script:
- oc tag --source=docker ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest ${IMAGE_NAME}:latest --token ${OC_TOKEN} --server=${OC_SERVER} -n ${OC_PROJECT} - oc tag --source=docker ${CI_REGISTRY_IMAGE}/${IMAGE_NAME}:latest ${IMAGE_NAME}:latest --token ${OC_TOKEN} --server=${OC_SERVER} -n ${OC_PROJECT}