diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 99ad1d002cd31daf82331c49bd03842afe0f105c..5805d751b43a3f155724f3938729660a7545efeb 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -7,9 +7,6 @@ variables: DOCKER_NODE_IMAGE_NAME: node KUBE_NAMESPACE: metager-2 -include: - - template: Auto-DevOps.gitlab-ci.yml - workflow: rules: - if: $CI_COMMIT_BRANCH != "master" && $CI_COMMIT_BRANCH != "development" && ($CI_COMMIT_TAG || $CI_COMMIT_BRANCH) diff --git a/.gitlab/ci/deploy.yml b/.gitlab/ci/deploy.yml index 1028c34d0360ea8fe91353742d07606693f80e5f..eca7a063f39cc3b31dfe1b662b47cc5bb4fc27d7 100644 --- a/.gitlab/ci/deploy.yml +++ b/.gitlab/ci/deploy.yml @@ -9,6 +9,8 @@ DEPLOYMENT_CHART_NAME: ${CI_COMMIT_REF_SLUG} BRANCH_NAME: $CI_COMMIT_REF_NAME COMMIT_NAME: $CI_COMMIT_REF_SLUG + before_script: + - kubectl config get-contexts script: - .gitlab/deployment_scripts/update_secret.sh - .gitlab/deployment_scripts/update_deployment.sh