From 04ab612e2ae5b29abd93f8ab268139789e549d15 Mon Sep 17 00:00:00 2001
From: Kamal Dodiya <40833799+kamaldodiya@users.noreply.github.com>
Date: Thu, 25 Jan 2024 14:41:21 +0000
Subject: [PATCH 1/2] Deploy on newk8s for review app default backend

---
 .gitlab-ci.yml | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index fdc02f42..20235848 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -129,6 +129,15 @@ Dev:WP40:HL:
   environment:
     name: wp40-hl-development
 
+Dev:WP51:HL:
+  extends: .deploy-newk8s
+  <<: *deploy-rules
+  environment:
+    name: wp51-hl-development
+  rules:
+    - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "review-on-newk8s"'
+      when: always
+    
 Dev:WP41:HX:
   extends: .deploy-newk8s
   <<: *deploy-rules

From 82866968263f8d36be0a72fc8b32bea1d7ce9cd5 Mon Sep 17 00:00:00 2001
From: Kamal Dodiya <40833799+kamaldodiya@users.noreply.github.com>
Date: Wed, 21 Feb 2024 11:33:35 +0000
Subject: [PATCH 2/2] Cleanup

---
 .gitlab-ci.yml | 90 +++++---------------------------------------------
 1 file changed, 8 insertions(+), 82 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 20235848..f31fdf1b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -20,37 +20,10 @@ variables:
     - docker rmi ${DOCKER_IMAGE}
     - docker logout $CI_REGISTRY
 
-.deploy:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:0.1
-
-  script:
-    - sed -i "s#<DOCKER_IMAGE>#${DOCKER_IMAGE}#g" k8s/deployment.yaml
-    - kubectl apply -f k8s/deployment.yaml
-    - kubectl apply -f k8s/service-node.yaml
-
-# Template to deploy to staging, internal, prod
-.deploy-wp:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:0.1
-
-  script:
-    - sed -i "s#<DOCKER_IMAGE>#${DOCKER_IMAGE}#g" k8s/deployment.yaml
-    - kubectl apply -f k8s/deployment.yaml
-
-# Template to deploy to dev (Review apps) using kustmoize
-.deploy-wp-kstmz:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:0.3
-
-  script:
-    - kustomize edit set image DOCKER_IMAGE=${DOCKER_IMAGE}
-    - kustomize build . | kubectl apply -f -
-
 # Template to deploy to staging, internal, prod
-.deploy-newk8s:
+.deploy:
   stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:0.6
+  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:latest
   script:
     - git clone https://gitlab.ebi.ac.uk/ensembl-web/ensembl-k8s-manifests.git
     - git -C ensembl-k8s-manifests/ checkout k8s123-migration
@@ -63,83 +36,36 @@ variables:
     - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "main"'
       when: always
 
-# Template to deploy to dev (Review apps)
-.deploy-wp-review:
-  stage: deploy
-  image: dockerhub.ebi.ac.uk/ensembl-web/deploy-tools:0.3
-
-  before_script:
-    - cd k8s/overlays/review
-
-  script:
-    - kustomize edit set namesuffix -- -${CI_COMMIT_REF_SLUG}
-    - kustomize edit set image DOCKER_IMAGE=${DOCKER_IMAGE}
-    - kustomize edit add label -f environment:${CI_COMMIT_REF_SLUG}
-    - kustomize build . | kubectl apply -f -
-
 build:
   extends: .build
 
-# Default help-and-docs api deployment used by all ensembl-client review branches
-Dev:
-  extends: .deploy-wp-kstmz
-  environment:
-    name : wp-hx-dev
-  before_script:
-    - cd k8s/overlays/development
-    - kustomize edit add label -f environment:dev
-  only:
-  - main
-
-# Custom help-and-docs api deployment for any development branch of the api
-Review:
-  extends: .deploy-wp-review
-  environment:
-    name : wp-hx-dev
-  except:
-  - main
-
 Live:WP40:HL:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp40-hl-prod
 
 Live:WP41:HX:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp41-hx-prod
 
 Staging:WP40:HL:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp40-hl-staging
 
 Internal:WP40:HL:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp40-hl-internal
 
-Dev:WP40:HL:
-  extends: .deploy-newk8s
-  <<: *deploy-rules
-  environment:
-    name: wp40-hl-development
-
 Dev:WP51:HL:
-  extends: .deploy-newk8s
+  extends: .deploy
   <<: *deploy-rules
   environment:
     name: wp51-hl-development
-  rules:
-    - if: '$CI_DEPLOY_FREEZE == null && $CI_COMMIT_BRANCH == "review-on-newk8s"'
-      when: always
-    
-Dev:WP41:HX:
-  extends: .deploy-newk8s
-  <<: *deploy-rules
-  environment:
-    name: wp41-hx-development
+