fix: add job rules

charts/ci-build-deploy.yml

@@ -12,7 +12,14 @@
     DOCKER_CERT_PATH: "/certs/client"
   before_script:
     - echo $CI_REGISTRY_PASSWORD | docker login -u $CI_REGISTRY_USER --password-stdin $CI_REGISTRY
-  
+  script:
+    - |
+      docker build --pull \
+      -t $IMAGE_TAG \
+      -f $DOCKERFILE \
+      --target $BUILD_TARGET \
+      $BUILD_PATH
+    - docker push "$IMAGE_TAG"
   artifacts:
     paths:
       - .env_file
@@ -24,14 +31,6 @@
     BUILD_TARGET: "prod"
     BUILD_PATH: "./services"
     DOCKERFILE: "./services/data-manager/Dockerfile"
-  script:
-    - |
-      docker build --pull \
-      -t $IMAGE_TAG \
-      -f $DOCKERFILE \
-      --target $BUILD_TARGET \
-      $BUILD_PATH
-    - docker push "$IMAGE_TAG"
   after_script:
     - echo "export DATA_MANAGER_IMAGE=$IMAGE_TAG" >> .env_file
 
@@ -39,19 +38,19 @@ build-data-manager-image-dev:
   extends: .build-data-manager-image
   variables:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/data-manager:dev"
-  #rules:
-  #  - if: $CI_COMMIT_BRANCH == "development"
-  #    changes:
-  #    - services/data-manager/**/*
+  rules:
+    - if: $CI_COMMIT_BRANCH == "development"
+      changes:
+      - services/data-manager/**/*
 
 build-data-manager-image-prod:
   extends: .build-data-manager-image
   variables:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/data-manager:latest"
-  #rules:
-  #  - if: $CI_COMMIT_BRANCH == "main"
-  #    changes:
-  #    - services/data-manager/**/*
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+      changes:
+      - services/data-manager/**/*
 
 .build-ical-image:
   extends: .build-image
@@ -59,8 +58,6 @@ build-data-manager-image-prod:
     BUILD_TARGET: "prod"
     BUILD_PATH: "./services"
     DOCKERFILE: "./services/ical/Dockerfile"
-  script:
-    - echo "Build"
   after_script:
     - echo "export ICAL_IMAGE=$IMAGE_TAG" >> .env_file
 
@@ -70,10 +67,10 @@ build-ical-image-dev:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/ical:dev"
   needs:
     - job: build-data-manager-image-dev
-  #rules:
-  #  - if: $CI_COMMIT_BRANCH == "development"
-  #    changes:
-  #    - services/ical/**/*
+  rules:
+    - if: $CI_COMMIT_BRANCH == "development"
+      changes:
+      - services/ical/**/*
 
 build-ical-image-prod:
   extends: .build-ical-image
@@ -81,10 +78,10 @@ build-ical-image-prod:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/ical:latest"
   needs:
     - job: build-data-manager-image-prod
-  #rules:
-  #  - if: $CI_COMMIT_BRANCH == "main"
-  #    changes:
-  #    - services/ical/**/*
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+      changes:
+      - services/ical/**/*
 
 .build-frontend-image:
   extends: .build-image
@@ -92,8 +89,6 @@ build-ical-image-prod:
     BUILD_TARGET: "prod"
     BUILD_PATH: "./frontend"
     DOCKERFILE: "./frontend/Dockerfile"
-  script:
-    - echo "Build"
   after_script:
     - echo "export FRONTEND_IMAGE=$IMAGE_TAG" >> .env_file
 
@@ -103,10 +98,10 @@ build-frontend-image-dev:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/frontend:dev"
   needs:
     - job: build-ical-image-dev
-  #rules:
-  #  - if: $CI_COMMIT_BRANCH == "development"
-  #    changes:
-  #    - frontend/**/*
+  rules:
+    - if: $CI_COMMIT_BRANCH == "development"
+      changes:
+      - frontend/**/*
 
 build-frontend-image-prod:
   extends: .build-frontend-image
@@ -114,10 +109,10 @@ build-frontend-image-prod:
     IMAGE_TAG: "$CI_REGISTRY_IMAGE/frontend:latest"
   needs:
     - job: build-ical-image-prod
-  #rules:
-  #  - if: $CI_COMMIT_BRANCH == "main"
-  #    changes:
-  #    - frontend/**/*
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+      changes:
+      - frontend/**/*
 
 .package-helm-chart:
   stage: package
@@ -158,12 +153,12 @@ package-helm-chart-dev:
     - yq e -i '(.production) = false' $VALUES_FILE
   needs:
     - build-frontend-image-dev
-  #rules:
-  #  - if: '$CI_COMMIT_BRANCH == "development"'
-  #    changes:
-  #      - services/data-manager/**/*
-  #      - services/ical/**/*
-  #      - frontend/**/*
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "development"'
+      changes:
+        - services/data-manager/**/*
+        - services/ical/**/*
+        - frontend/**/*
 
 package-helm-chart-prod:
   extends: .package-helm-chart
@@ -188,14 +183,14 @@ package-helm-chart-prod:
     - envsubst < configmap-google.yaml > $CHARTS_DIR/templates/configmap-google.yaml
   needs:
     - build-frontend-image-prod
-  #rules:
-  #  - if: '$CI_COMMIT_BRANCH == "main"'
-  #    changes:
-  #      - services/data-manager/**/*
-  #      - services/ical/**/*
-  #      - frontend/**/*
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main"'
+      changes:
+        - services/data-manager/**/*
+        - services/ical/**/*
+        - frontend/**/*
 
-.trigger_deploy:
+trigger_deploy:
   stage: deploy
   image: alpine:latest
   before_script:
@@ -214,14 +209,5 @@ package-helm-chart-prod:
       -F "variables[UPSTREAM_REGISTRY_PATH]=$CI_REGISTRY_IMAGE" \
       "$CI_API_V4_URL/projects/$CI_DEPLOY_REPO_ID/trigger/pipeline"
     - "echo 'The $PROJECT_NAME can be viewed on: $PROJECT_URL'"
-  #rules:
-  #  - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "development"'
-
-trigger-dev:
-  extends: .trigger_deploy
-  needs:
-    - package-helm-chart-dev
-trigger-prod:
-  extends: .trigger_deploy
-  needs:
-    - package-helm-chart-prod
+  rules:
+    - if: '$CI_COMMIT_BRANCH == "main" || $CI_COMMIT_BRANCH == "development"'