Update pipeline (DRY)

.gitlab-ci.yml

@@ -23,11 +23,26 @@ stages:
   - deliver
   - deploy
 
+.changes-backend: &changes-backend
+  changes:
+    - auth-domain/**/*
+    - flights-domain/**/*
+    - subscription-domain/**/*
+    - gateway/**/*
+
+.changes-frontend: &changes-frontend
+  changes:
+    - screen-domain/**/*
+    - browser-domain/**/*
+
 preparation:
   stage: prep
   tags:
     - dev
   before_script: []
+  rules:
+    - *changes-frontend
+    - *changes-backend
   script:
     - export BUILD_ID=$(date +%Y%m%d%H%M)
     - echo "BUILD_ID=${BUILD_ID}" > context.env
@@ -65,8 +80,12 @@ preparation:
   stage: build
   tags:
     - dev
+  rules:
+    - *changes-frontend
+    - *changes-backend
   needs:
     - job: preparation
+      optional: true
       artifacts: true
 
 build-auth-api:
@@ -162,7 +181,9 @@ test-auth-api:
     - *test-api-script
   needs:
     - job: build-auth-api
+      optional: true
     - job: preparation
+      optional: true
       artifacts: true
 
 test-subscription-api:
@@ -179,7 +200,9 @@ test-subscription-api:
     - *test-api-script
   needs:
     - job: build-subscription-api
+      optional: true
     - job: preparation
+      optional: true
       artifacts: true
 
 test-flights-api:
@@ -196,7 +219,9 @@ test-flights-api:
     - *test-api-script
   needs:
     - job: build-flights-api
+      optional: true
     - job: preparation
+      optional: true
       artifacts: true
 
 test-gateway:
@@ -213,7 +238,9 @@ test-gateway:
     - *test-api-script
   needs:
     - job: build-gateway
+      optional: true
     - job: preparation
+      optional: true
       artifacts: true
 
 .test-client-script: &test-client-script
@@ -248,7 +275,9 @@ test-browser-client:
     - *test-client-script
   needs:
     - job: build-browser-client
+      optional: true
     - job: preparation
+      optional: true
       artifacts: true
 
 test-screen-client:
@@ -264,7 +293,9 @@ test-screen-client:
     - *test-client-script
   needs:
     - job: build-screen-client
+      optional: true
     - job: preparation
+      optional: true
       artifacts: true
 
 .test-integration: &test-integration
@@ -302,17 +333,27 @@ test-screen-client:
   - export API_IMAGE=${GATEWAY_TEST_IMAGE_NAME}
   - docker compose -f gateway/docker-compose.dev.yml --env-file $ENV_DEV_FILE down
 
+.needs-backend-tests: &needs-backend-tests
+  - job: test-flights-api
+    optional: true
+  - job: test-auth-api
+    optional: true
+  - job: test-subscription-api
+    optional: true
+  - job: test-gateway
+    optional: true
+  - job: preparation
+    optional: true
+    artifacts: true
+
 test-browser-integration:
   stage: test
   tags:
     - dev
   rules:
+    - *changes-backend
     - changes:
-      - auth-domain/**/*
       - browser-domain/**/*
-      - flights-domain/**/*
-      - subscription-domain/**/*
-      - gateway/**/*
   script:
     - export CLIENT_IMAGE=${BROWSER_CLIENT_TEST_IMAGE_NAME}
     - export FOLDER=browser-domain
@@ -320,30 +361,18 @@ test-browser-integration:
   after_script:
     - *test-integration-clean
   needs:
-    - job: test-flights-api
-      optional: true
-    - job: test-auth-api
-      optional: true
-    - job: test-subscription-api
-      optional: true
-    - job: test-gateway
-      optional: true
     - job: test-browser-client
       optional: true
-    - job: preparation
-      artifacts: true
+    - *needs-backend-tests
 
 test-screen-integration:
   stage: test
   tags:
     - dev
   rules:
+    - *changes-backend
     - changes:
-      - auth-domain/**/*
       - screen-domain/**/*
-      - flights-domain/**/*
-      - subscription-domain/**/*
-      - gateway/**/*
   script:
     - export CLIENT_IMAGE=${SCREEN_CLIENT_TEST_IMAGE_NAME}
     - export FOLDER=screen-domain
@@ -351,33 +380,19 @@ test-screen-integration:
   after_script:
     - *test-integration-clean
   needs:
-    - job: test-flights-api
-      optional: true
-    - job: test-auth-api
-      optional: true
-    - job: test-subscription-api
-      optional: true
-    - job: test-gateway
-      optional: true
     - job: test-screen-client
       optional: true
     - job: test-browser-integration
       optional: true
-    - job: preparation
-      artifacts: true
+    - *needs-backend-tests
 
 deliver-dockerhub:
   stage: deliver
   tags:
     - dev
   rules:
-    - changes:
-      - auth-domain/**/*
-      - screen-domain/**/*
-      - browser-domain/**/*
-      - flights-domain/**/*
-      - subscription-domain/**/*
-      - gateway/**/*
+    - *changes-backend
+    - *changes-frontend
     - if: $FORCE_DEPLOY == "true"
   script:
     - docker login -u $DOCKER_HUB_USER --password $DOCKER_HUB_PASS
@@ -396,37 +411,14 @@ deliver-dockerhub:
     - docker push $DOCKER_HUB_BROWSER_CLIENT_IMAGE
     - docker push $DOCKER_HUB_SCREEN_CLIENT_IMAGE
   needs:
+    - job: test-browser-integration
+      optional: true
     - job: test-screen-integration
       optional: true
     - job: preparation
+      optional: true
       artifacts: true
 
-# TODO: remove, it doesn't make sense for this to be in the pipeline...
-# build-and-run-elk:
-#   extends:
-#     - .build
-#   rules:
-#     - changes:
-#       - observability/**/*
-#   script:
-#     - export ELK_SETUP_IMAGE=${IMAGE_BASE}/elasticsearch:prod
-#     - export ELASTICSEARCH_IMAGE=${IMAGE_BASE}/elk-setup:prod
-#     - export LOGSTASH_IMAGE=${IMAGE_BASE}/heartbeat:prod
-#     - export KIBANA_IMAGE=${IMAGE_BASE}/kibana:prod
-#     - export CURATOR_IMAGE=${IMAGE_BASE}/curator:prod
-#     - export HEARTBEAT_IMAGE=${IMAGE_BASE}/logstash:prod
-#     - export ELK=observability/elk
-
-#     - docker build $ELK/setup -f $ELK/setup/Dockerfile --build-arg "ELASTIC_VERSION=8.7.1" -t ${ELK_SETUP_IMAGE}
-#     - docker build $ELK/elasticsearch -f $ELK/elasticsearch/Dockerfile --build-arg "ELASTIC_VERSION=8.7.1" -t ${ELASTICSEARCH_IMAGE}
-#     - docker build $ELK/logstash -f $ELK/logstash/Dockerfile --build-arg "ELASTIC_VERSION=8.7.1" -t ${LOGSTASH_IMAGE}
-#     - docker build $ELK/kibana -f $ELK/kibana/Dockerfile --build-arg "ELASTIC_VERSION=8.7.1" -t ${KIBANA_IMAGE}
-#     - docker build $ELK/extensions/curator -f $ELK/extensions/curator/Dockerfile -t ${CURATOR_IMAGE}
-#     - docker build $ELK/extensions/heartbeat -f $ELK/extensions/heartbeat/Dockerfile --build-arg "ELASTIC_VERSION=8.7.1" -t ${HEARTBEAT_IMAGE}
-
-#     - docker compose -f observability/docker-compose.yml --env-file $ENV_DEV_FILE --profile setup up -d
-#     - docker compose -f observability/docker-compose.yml -f $ELK/extensions/curator/curator-compose.yml -f $ELK/extensions/heartbeat/heartbeat-compose.yml --env-file $ENV_DEV_FILE up -d
-
 .stop-and-run: &stop-and-run
     - docker compose -f ${FOLDER}/docker-compose.yml --env-file $ENV_PROD_FILE down
     - docker compose -f ${FOLDER}/docker-compose.yml --env-file $ENV_PROD_FILE pull
@@ -480,4 +472,5 @@ deploy-prod:
     - job: build-and-run-elk
       optional: true
     - job: preparation
+      optional: true
       artifacts: true

run.sh

@@ -62,7 +62,7 @@ elif [ -n "$domain" ] && [ -z "$down" ]; then
             docker build $USER_MANAGER -f $USER_MANAGER/Dockerfile.prod -t $USER/user-manager:prod
 
             if [ -n "$tests" ]; then
-                docker build $USER_MANAGER -f $USER_MANAGER/Dockerfile.test --build-arg "BASE_IMAGE=$USER/user-manager:prod" -t $USER/user-manager:test
+                docker build $USER_MANAGER -f $USER_MANAGER/Dockerfile.test -t $USER/user-manager:test
                 export API_IMAGE=$USER/user-manager:test
                 docker compose -f auth-domain/docker-compose.yml --env-file auth-domain/.env.prod down
                 docker compose -f auth-domain/docker-compose.yml --env-file auth-domain/.env.dev up --abort-on-container-exit
@@ -79,7 +79,7 @@ elif [ -n "$domain" ] && [ -z "$down" ]; then
             docker build $FLIGHTS_INFORMATION -f $FLIGHTS_INFORMATION/Dockerfile.prod -t $USER/flights-information:prod
 
             if [ -n "$tests" ]; then
-                docker build $FLIGHTS_INFORMATION -f $FLIGHTS_INFORMATION/Dockerfile.test --build-arg "BASE_IMAGE=$USER/flights-information:prod" -t $USER/flights-information:test
+                docker build $FLIGHTS_INFORMATION -f $FLIGHTS_INFORMATION/Dockerfile.test -t $USER/flights-information:test
                 export API_IMAGE=$USER/flights-information:test
                 docker compose -f flights-domain/docker-compose.yml --env-file flights-domain/.env.dev down
                 docker compose -f flights-domain/docker-compose.yml --env-file flights-domain/.env.dev up --abort-on-container-exit
@@ -94,7 +94,7 @@ elif [ -n "$domain" ] && [ -z "$down" ]; then
             docker build $SUBSCRIPTION_MANAGER -f $SUBSCRIPTION_MANAGER/Dockerfile.prod -t $USER/subs-manager:prod
 
             if [ -n "$tests" ]; then
-                docker build $SUBSCRIPTION_MANAGER -f $SUBSCRIPTION_MANAGER/Dockerfile.test --build-arg "BASE_IMAGE=$USER/subs-manager:prod" -t $USER/subs-manager:test
+                docker build $SUBSCRIPTION_MANAGER -f $SUBSCRIPTION_MANAGER/Dockerfile.test -t $USER/subs-manager:test
                 export API_IMAGE=$USER/subs-manager:test
                 docker compose -f subscription-domain/docker-compose.yml --env-file subscription-domain/.env.dev down
                 docker compose -f subscription-domain/docker-compose.yml --env-file subscription-domain/.env.dev up --abort-on-container-exit
@@ -108,7 +108,7 @@ elif [ -n "$domain" ] && [ -z "$down" ]; then
             docker build gateway -f gateway/Dockerfile.prod -t $USER/gateway:prod
 
             if [ -n "$tests" ]; then
-                docker build gateway -f gateway/Dockerfile.test --build-arg "BASE_IMAGE=$USER/gateway:prod" -t $USER/gateway:test
+                docker build gateway -f gateway/Dockerfile.test -t $USER/gateway:test
                 export API_IMAGE=$USER/gateway:test
                 docker compose -f gateway/docker-compose.yml down
                 docker compose -f gateway/docker-compose.yml up -d