ci: refactoring

.gitlab-ci.yml

@@ -85,7 +85,6 @@ clean install:
   variables:
     CLUSTER_NAME: "clean-${CI_COMMIT_SHORT_SHA}"
   script:
-    - exit 0
     - *deploy_bigbang
     - *test_bigbang
     - docker exec -i k3d-${CLUSTER_NAME}-server-0 crictl images -o json | jq -r '.images[].repoTags[0] | select(. != null)' > images.txt
@@ -109,7 +108,6 @@ upgrade:
   variables:
     CLUSTER_NAME: "clean-${CI_COMMIT_SHORT_SHA}"
   script:
-    - exit 1
     - if $CHART_BREAKING_CHANGE; then echo "Breaking change detected by chart version difference, skipping job"; exit 0; fi
     - echo "Install Big Bang from ${CI_DEFAULT_BRANCH}"
     - git fetch && git checkout ${CI_DEFAULT_BRANCH}
@@ -169,18 +167,18 @@ aws/network up:
   extends:
     - .infra fork
     - .network up
-  # environment:
-  #   name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
-  #   auto_stop_in: 1 hour
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+    auto_stop_in: 1 hour
 
 aws/network down:
   extends:
     - .infra cleanup
     - .network down
   stage: network down
-  # environment:
-  #   name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
-  #   action: stop
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+    action: stop
 
 #-----------------------------------------------------------------------------------------------------------------------
 
@@ -194,8 +192,10 @@ aws/rke2/cluster up:
   extends:
     - .infra create
     - .rke2 up
-  # environment:
-  #   name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+  needs:
+    - job: aws/network up
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 # Install BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang up:
@@ -213,8 +213,8 @@ aws/rke2/bigbang up:
     - kubectl apply -f ${CI_PROJECT_DIR}/.gitlab-ci/jobs/rke2/dependencies/k8s-resources/aws/default-ebs-sc.yaml
   script:
     - *deploy_bigbang
-  # environment:
-  #   name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 # Run tests on BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang test:
@@ -225,6 +225,7 @@ aws/rke2/bigbang test:
   needs:
     - job: aws/rke2/cluster up
       artifacts: true
+    - job: aws/rke2/bigbang up
   before_script:
     - mkdir -p ~/.kube
     - cp ${CI_PROJECT_DIR}/rke2.yaml ~/.kube/config
@@ -234,8 +235,8 @@ aws/rke2/bigbang test:
     - yum install bind-utils -y
     - ./scripts/hosts.sh
     - *test_bigbang
-  # environment:
-  #   name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 # Uninstall BigBang on RKE2 cluster on AWS
 aws/rke2/bigbang down:
@@ -246,6 +247,7 @@ aws/rke2/bigbang down:
   needs:
     - job: aws/rke2/cluster up
       artifacts: true
+    - job: aws/rke2/bigbang test
   before_script:
     - mkdir -p ~/.kube
     - cp ${CI_PROJECT_DIR}/rke2.yaml ~/.kube/config
@@ -253,8 +255,8 @@ aws/rke2/bigbang down:
     - helm un -n bigbang bigbang
     # TODO: Smarter wait
     - sleep 180
-  # environment:
-  #   name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 # Destroy RKE2 cluster on AWS
 aws/rke2/cluster down:
@@ -262,8 +264,10 @@ aws/rke2/cluster down:
   extends:
     - .infra cleanup
     - .rke2 down
-  # environment:
-  #   name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
+  needs:
+    - job: aws/rke2/bigbang down
+  environment:
+    name: review/aws-${CI_COMMIT_REF_SLUG}-${CI_COMMIT_SHORT_SHA}
 
 #-----------------------------------------------------------------------------------------------------------------------