From b0b46fa889917b44aeae37aaaf4093ddfc8404b8 Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Thu, 9 Nov 2023 12:36:08 +0100
Subject: [PATCH] add prod steps and set some global variables
---
.gitlab-ci.yml | 56 +++++++++++++++++++++++++++++++++++---------------
1 file changed, 40 insertions(+), 16 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 7f1944a4..63137b91 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,14 @@
variables:
HELM_VERSION: "3.9.3"
IMAGE_NAME: "df-wiki"
+ # dev
+ HOST_DEV: 'defense-finder.dev.pasteur.cloud'
+ MEILI_HOST_DEV: 'defense-finder-meilisearch.dev.pasteur.cloud'
+ # prod
+ HOST_PROD: 'defense-finder.pasteur.cloud'
+ MEILI_HOST_PROD: 'defense-finder-meilisearch.pasteur.cloud'
+
+
cache:
paths:
@@ -65,10 +73,25 @@ deploy:meilisearch:dev:
variables:
CI_DEBUG_TRACE: "true"
ENV: "development"
- PUBLIC_URL: "defense-finder-meilisearch.dev.pasteur.cloud"
+ PUBLIC_URL: "$MEILI_HOST_DEV"
environment:
name: k8sdev-01
- url: "https://defense-finder-meilisearch.dev.pasteur.cloud"
+ url: "https://${MEILI_HOST_DEV}"
+
+
+deploy:meilisearch:prod:
+ extends: .deploy:meilisearch
+ rules:
+ - if: $CI_COMMIT_BRANCH == "main"
+ variables:
+ CI_DEBUG_TRACE: "false"
+ ENV: "production"
+ PUBLIC_URL: $MEILI_HOST_PROD
+ environment:
+ name: k8sprod-02
+ url: "https://${MEILI_HOST_PROD}"
+
+
delete-meili-helm-release:
@@ -107,7 +130,15 @@ update-refseq-index:dev:
needs:
- deploy:meilisearch:dev
variables:
- MEILI_HOST: 'https://defense-finder-meilisearch.dev.pasteur.cloud'
+ MEILI_HOST: "https://${MEILI_HOST_DEV}"
+
+
+update-refseq-index:prod:
+ extends: .update-refseq-index
+ needs:
+ - deploy:meilisearch:prod
+ variables:
+ MEILI_HOST: '"https://${MEILI_HOST_PROD}"'
############# get-meili-key ###############
@@ -131,14 +162,14 @@ set-meili-env:dev:
needs:
- deploy:meilisearch:dev
variables:
- MEILI_HOST: 'https://defense-finder-meilisearch.dev.pasteur.cloud'
+ MEILI_HOST: "https://${MEILI_HOST_DEV}"
rules:
- if: $CI_COMMIT_BRANCH != "main"
set-meili-env:prod:
extends: .set-meili-env
variables:
- MEILI_HOST: 'https://defense-finder-meilisearch.pasteur.cloud'
+ MEILI_HOST: "https://${MEILI_HOST_PROD}"
rules:
- if: $CI_COMMIT_BRANCH == "main"
@@ -225,8 +256,6 @@ build:dev:wiki:
- set-meili-env:dev
variables:
BASE_URL: /wiki/
- # MEILI_HOST: 'https://defense-finder-meilisearch.dev.pasteur.cloud'
- # MEILI_API_KEY: "${MEILI_MASTER_KEY}"
rules:
- if: $CI_COMMIT_BRANCH != "main"
@@ -239,8 +268,6 @@ build:prod:wiki:
- format-pfam
variables:
BASE_URL: /wiki/
- # MEILI_HOST: 'https://defense-finder-meilisearch.pasteur.cloud'
- # MEILI_API_KEY: "${MEILI_MASTER_KEY}"
rules:
- if: $CI_COMMIT_BRANCH == "main"
@@ -252,8 +279,6 @@ build:prod:wiki:
variables:
CI_DEBUG_TRACE: "false"
TEAM_ID: "df"
-# --set meilisearch.environment.MEILI_MASTER_KEY="${MEILI_MASTER_KEY}"
-# --set meilisearch.environment.MEILI_ENV="${ENV}"
script:
- >
helm upgrade --install $CI_PROJECT_NAME-$CI_ENVIRONMENT_NAME ./deploy/df-wiki --namespace=${KUBE_NAMESPACE}
@@ -279,12 +304,12 @@ deploy:dev:
variables:
NODE_ENV: "development"
KUBE_NAMESPACE: "defense-finder-dev"
- PUBLIC_URL: "defense-finder.dev.pasteur.cloud"
+ PUBLIC_URL: "${HOST_DEV}"
CI_DEBUG_TRACE: "true"
ENV: "development"
environment:
name: k8sdev-01
- url: "https://defense-finder.dev.pasteur.cloud"
+ url: "https://${HOST_DEV}"
deploy:prod:
@@ -297,13 +322,12 @@ deploy:prod:
variables:
NODE_ENV: "production"
KUBE_NAMESPACE: "defense-finder-prod"
- PUBLIC_URL: "defense-finder.pasteur.cloud"
+ PUBLIC_URL: "${HOST_PROD}"
CI_DEBUG_TRACE: "false"
ENV: "production"
-
environment:
name: k8sprod-02
- url: "https://defense-finder.pasteur.cloud"
+ url: "https://${HOST_PROD}"
delete-helm-release:
except:
--
GitLab