From 7aa05f51ff5604cac7e41051276b25e5c7fe7532 Mon Sep 17 00:00:00 2001
From: Santiago Lo Coco <santilococo.01@gmail.com>
Date: Sun, 12 Nov 2023 09:16:10 -0300
Subject: [PATCH] Update pipeline

Use artifacts:reports:dotenv and selectively download artifacts
---
 .gitlab-ci.yml | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fee068e..fdcb694 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -13,8 +13,7 @@ default:
       - script_failure
       - api_failure
   before_script:
-      - export $(cat context.env | xargs)
-      - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
+    - docker login -u $CI_REGISTRY_USER --password $CI_JOB_TOKEN $CI_REGISTRY
 
 stages:
   - prep
@@ -67,8 +66,8 @@ preparation:
     - echo "ENV_DEV_FILE=$(echo $ENV_DEV)" >> context.env
     - echo "ENV_PROD_FILE=$(echo $ENV_PROD)" >> context.env
   artifacts:
-    paths:
-      - context.env
+    reports:
+      dotenv: context.env
 
 .build-and-push-script: &build-and-push-script
   - docker build ${FOLDER} -f ${FOLDER}/Dockerfile.prod --build-arg "${BUILD_ARG_PROD}" --build-arg "${BUILD_ARG_PROD_OTHER}" -t ${PROD_IMAGE}
@@ -323,7 +322,6 @@ test-screen-client:
   - docker compose -f ${FOLDER}/docker-compose.dev.yml --env-file $ENV_DEV_FILE up --abort-on-container-exit
 
 .test-integration-clean: &test-integration-clean
-  - export $(cat context.env | xargs)
   - export API_IMAGE=${FLIGHTS_INFO_TEST_IMAGE_NAME}
   - docker compose -f flights-domain/docker-compose.dev.yml --env-file $ENV_DEV_FILE down
   - export API_IMAGE=${USER_MANAGER_TEST_IMAGE_NAME}
@@ -336,12 +334,16 @@ test-screen-client:
 .needs-backend-tests: &needs-backend-tests
   - job: test-flights-api
     optional: true
+    artifacts: false
   - job: test-auth-api
     optional: true
+    artifacts: false
   - job: test-subscription-api
     optional: true
+    artifacts: false
   - job: test-gateway
     optional: true
+    artifacts: false
   - job: preparation
     optional: true
     artifacts: true
@@ -363,6 +365,7 @@ test-browser-integration:
   needs:
     - job: test-browser-client
       optional: true
+      artifacts: false
     - *needs-backend-tests
 
 test-screen-integration:
@@ -382,6 +385,7 @@ test-screen-integration:
   needs:
     - job: test-screen-client
       optional: true
+      artifacts: false
     - job: test-browser-integration
       optional: true
     - *needs-backend-tests
@@ -413,8 +417,10 @@ deliver-dockerhub:
   needs:
     - job: test-browser-integration
       optional: true
+      artifacts: false
     - job: test-screen-integration
       optional: true
+      artifacts: false
     - job: preparation
       optional: true
       artifacts: true
@@ -469,8 +475,7 @@ deploy-prod:
   needs:
     - job: deliver-dockerhub
       optional: true
-    - job: build-and-run-elk
-      optional: true
+      artifacts: false
     - job: preparation
       optional: true
       artifacts: true