diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index d5512a9255f708c9dc85f95e2cbf24ffbf9fb765..4b0a7c5944298d87d39e48f4931e9e586b9ca84d 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -228,7 +228,6 @@ delete-app-with-pvc: - helm delete -n ${NAMESPACE} ${CI_COMMIT_REF_SLUG} - kubectl delete pvc -n ${NAMESPACE} -lapp.kubernetes.io/instance=${CI_COMMIT_REF_SLUG} - dump-prod-for-dev: stage: deploy needs: [] @@ -244,22 +243,21 @@ dump-prod-for-dev: - echo $NAMESPACE # - POSTGRES_PASSWORD="$(kubectl get secret postgres.release-postgresql.credentials.postgresql.acid.zalan.do --output jsonpath='{.data.password}' | base64 -d)" - DB_POD=$(kubectl -n=${NAMESPACE} get po -l cluster-name=release-postgresql,application=spilo --output jsonpath='{.items[0].metadata.name}') - - kubectl -n=${NAMESPACE} exec $DB_POD --container postgres -- pg_dump --clean -U postgres postgres | gzip -c > prod.sql.gz + - kubectl -n=${NAMESPACE} exec $DB_POD --container postgres -- pg_dump --clean -U ippidb_user ippidb | gzip -c > prod.sql.gz artifacts: paths: - prod.sql.gz expire_in: 2 days - load-prod-in-dev: stage: deploy except: - release needs: - dump-prod-for-dev - - job : deploy-master + - job: deploy-master optional: true - - job : deploy-dev + - job: deploy-dev optional: true when: manual image: harbor.pasteur.fr/kube-system/helm-kubectl:3.4.0 @@ -274,5 +272,5 @@ load-prod-in-dev: - DB_POD=$(kubectl -n=${NAMESPACE} get po -l cluster-name=${CI_COMMIT_REF_SLUG}-postgresql,application=spilo --output jsonpath='{.items[0].metadata.name}') - helm history ${CI_COMMIT_REF_SLUG} --max 3 - gzip -d prod.sql.gz - - kubectl -n=${NAMESPACE} exec -i $DB_POD -- psql -U postgres postgres < prod.sql + - kubectl -n=${NAMESPACE} exec -i $DB_POD -- psql -U ippidb_user ippidb < prod.sql - echo "Import completed"