[#41] try fix CI/CD pipeline with proper tags

aisingapore · Jan 17, 2022 · a0b8eaf · a0b8eaf
1 parent a842cbc
commit a0b8eaf
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 2 deletions.
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -46,7 +46,7 @@ run_slow_unit_tests:
 generate_demo_api_yaml:
   stage: pre
   tags:
-    - on-prem
+    - dind
   image: alpine:latest
   script:
     - apk add -U jsonnet
@@ -58,7 +58,7 @@ generate_demo_api_yaml:
 generate_dev_demo_api_yaml:
   stage: pre
   tags:
-    - on-prem
+    - dind
   image: alpine:latest
   script:
     - apk add -U jsonnet

diff --git a/jsonnet/demo-api.jsonnet b/jsonnet/demo-api.jsonnet
@@ -3,6 +3,7 @@ local build_and_push_staging(module_name, image_name) = {
   stage: "build_and_push_staging",
   tags: [
     "on-prem",
+    "dind",
   ],
   when: "manual",
   script: [
@@ -20,6 +21,7 @@ local build_and_push_docs_staging() = {
   stage: "build_and_push_staging",
   tags: [
     "on-prem",
+    "dind",
   ],
   when: "manual",
   script: [
@@ -50,6 +52,7 @@ local retag_and_push_production(module_name, image_name) = {
   stage: "retag_and_push_production",
   tags: [
     "on-prem",
+    "dind",
   ],
   only: {
     refs: ["main"]
@@ -73,6 +76,7 @@ local restart_kubernetes_staging(module_name, deployment_name) = {
   stage: "restart_kubernetes_staging",
   tags: [
     "on-prem",
+    "dind",
   ],
   when: "manual",
   needs: ["%s_build_and_push_staging" % module_name],
@@ -88,6 +92,7 @@ local restart_kubernetes_production(module_name, deployment_name) = {
   stage: "restart_kubernetes_production",
   tags: [
     "on-prem",
+    "dind",
   ],
   only: {
     refs: ["main"]

diff --git a/jsonnet/dev-demo-api.jsonnet b/jsonnet/dev-demo-api.jsonnet
@@ -3,6 +3,7 @@ local build_and_push_staging(module_name, image_name) = {
   stage: "build_and_push_staging",
   tags: [
     "on-prem",
+    "dind",
   ],
   when: "manual",
   script: [
@@ -21,6 +22,7 @@ local restart_kubernetes_staging(module_name, deployment_name) = {
   stage: "restart_kubernetes_staging",
   tags: [
     "on-prem",
+    "dind",
   ],
   when: "manual",
   needs: ["%s_build_and_push_staging" % module_name],