Merge pull request #1 from getindata/dev_prod_separation

New templates for DEV/PROD separation

Author: p-pekala

dataops/dev_cicd_template.yml

@@ -1,14 +1,48 @@
 variables:
   GITLAB_CICD_IMAGE_REPO: gcr.io/getindata-images-public/cicd-dataops
-  GITLAB_CICD_IMAGE_TAG: gcp-0.1.1
+  GITLAB_CICD_IMAGE_TAG: gcp-0.1.4
   BLOB_CONFIG_PATH: blob_args.json
+  GIT_KEY_PATH: TBS
 
 dev:
   image: $GITLAB_CICD_IMAGE_REPO:$GITLAB_CICD_IMAGE_TAG
+  environment: DEVELOPMENT
   stage: execute-dev
   extends:
-    - .setup
+    - .dev_setup
   script:
-    - dp compile --docker-build
+    - dp compile --docker-build --env dev
     - dp deploy --blob-args $BLOB_CONFIG_PATH --datahub-ingest --docker-push
-    - dp publish --key-path $GIT_KEY_PATH
+  rules:
+    - if: '$CI_COMMIT_BRANCH != "master"'
+    - if: '$CI_COMMIT_BRANCH != "main"'
+
+release-dev:
+  image: $GITLAB_CICD_IMAGE_REPO:$GITLAB_CICD_IMAGE_TAG
+  environment: DEVELOPMENT
+  stage: execute-release
+  extends:
+    - .dev_setup
+  script:
+    - dp compile --help
+    - dp compile --docker-build --env dev --docker-tag $CI_COMMIT_TAG
+    - dp deploy --blob-args $BLOB_CONFIG_PATH --datahub-ingest --docker-push
+  rules:
+    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+/' #expects 'vX.Y.Z'
+
+release-prod:
+  image: $GITLAB_CICD_IMAGE_REPO:$GITLAB_CICD_IMAGE_TAG
+  environment: PRODUCTION
+  dependencies:
+    - release-dev
+  stage: execute-release
+  extends:
+    - .prod_setup
+  script:
+    - dp compile --env prod --docker-tag CI_COMMIT_TAG
+    - dp deploy --env prod --blob-args $BLOB_CONFIG_PATH --datahub-ingest
+    - dp publish --key-path $GIT_KEY_PATH
+  rules:
+    - if: '$CI_COMMIT_TAG'
+    - if: '$CI_COMMIT_TAG =~ /^v\d+\.\d+\.\d+/' #expects 'vX.Y.Z'

dataops/gcp/gcp_setup_template.yml

@@ -1,12 +1,28 @@
 variables:
+  GCP_KEY_PATH: TBS
+  GCP_DOCKER_KEY_PATH: TBS
+  GIT_KEY_PATH: TBD
   DOCKER_REGISTRY: europe-central2-docker.pkg.dev
   BLOB_CONFIG_PATH: blob_args.json
 
-.setup:
+.gcp_setup: &gcp_setup
+  - gcloud --quiet components update
+  - gcloud auth activate-service-account --key-file ${GCP_KEY_PATH}
+  - echo "{\"token\":\"$GCP_KEY_PATH\"}" > $BLOB_CONFIG_PATH
+
+.docker_setup: &docker_setup
+  - gcloud auth configure-docker $DOCKER_REGISTRY
+
+.git_setup: &git_setup
+  - chmod 600 $GIT_KEY_PATH
+
+.dev_setup:
+  before_script:
+    - *gcp_setup
+    - *docker_setup
+
+.prod_setup:
   before_script:
-    - gcloud --quiet components update
-    - gcloud auth configure-docker $DOCKER_REGISTRY
-    - gcloud auth activate-service-account --key-file ${GCP_KEY_PATH}
-    - docker login -u _json_key -p "$(cat ${GCP_KEY_PATH})" "https://$DOCKER_REGISTRY"
-    - chmod 600 $GIT_KEY_PATH
-    - echo "{\"token\":\"$GCP_KEY_PATH\"}" > $BLOB_CONFIG_PATH
+    - *gcp_setup
+    - *docker_setup
+    - *git_setup