From a96d18223a54f1684b4b623a5c8ff536a8dddfcb Mon Sep 17 00:00:00 2001
From: Remi  PLANEL <rplanel@pasteur.fr>
Date: Thu, 21 Dec 2023 18:05:08 +0100
Subject: [PATCH] cp website to container

---
 .gitlab-ci.yml | 63 ++++++++++++++++++++++++++++----------------------
 1 file changed, 35 insertions(+), 28 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acd67775..b2cf29ba 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -355,8 +355,12 @@ build:prod:wiki:
 
 
 
-build-wiki:
+
+build-wiki:prod:
   stage: build-wiki
+  needs:
+    - set-meili-env:prod
+    - get-zotero
   image: node:21.1-bookworm-slim
   variables:
     NODE_OPTIONS: --max_old_space_size=12288
@@ -374,7 +378,37 @@ build-wiki:
       - .output/public
 
 
+load-website:dev:
+  image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
+  stage: load-website
+  variables:
+    NAMESPACE: "defense-finder-dev"
+  environment:
+    name: "k8sdev-01"
+  rules:
+    - if: $CI_COMMIT_BRANCH != "main"
+  script:
+    - kubectl wait pod -l "app.kubernetes.io/name=df-wiki" --for condition=Ready --timeout=600s --namespace ${NAMESPACE}
+    - echo "Le pod est ready"
+
+
 
+load-website:prod:
+  image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
+  stage: load-website
+  needs: 
+    - build-wiki:prod
+  environment:
+    name: "k8sprod-02"
+  variables: 
+    NAMESPACE: "defense-finder-prod"
+  rules:
+    - if: $CI_COMMIT_BRANCH == "main"
+  script:
+    - kubectl --namespace ${NAMESPACE} wait pod -l "app.kubernetes.io/name=df-wiki" --for condition=Ready --timeout=600s 
+    - echo "Le pod est ready"
+    - WIKI_POD=$(kubectl --namespace ${NAMESPACE} get pods -l "app.kubernetes.io/name=df-wiki" --output jsonpath='{.items[0].metadata.name}')
+    - kubectl --namespace ${NAMESPACE} cp .output/public/ ${WIKI_POD}:/website
 
 
 ################ DEPLOY ##########################
@@ -467,30 +501,3 @@ delete-helm-release:prod:
     - helm delete -n ${NAMESPACE} $CI_PROJECT_NAME-$CI_ENVIRONMENT_NAME
 
 
-load-website:dev:
-  image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
-  stage: load-website
-  variables:
-    NAMESPACE: "defense-finder-dev"
-  environment:
-    name: "k8sdev-01"
-  rules:
-    - if: $CI_COMMIT_BRANCH != "main"
-  script:
-    - kubectl wait pod -l "app.kubernetes.io/name=df-wiki" --for condition=Ready --timeout=600s --namespace ${NAMESPACE}
-    - echo "Le pod est ready"
-
-
-
-load-website:prod:
-  image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
-  stage: load-website
-  environment:
-    name: "k8sprod-02"
-  variables: 
-    NAMESPACE: "defense-finder-prod"
-  rules:
-    - if: $CI_COMMIT_BRANCH == "main"
-  script:
-    - kubectl wait pod -l "app.kubernetes.io/name=df-wiki" --for condition=Ready --timeout=600s --namespace ${NAMESPACE}
-    - echo "Le pod est ready"
\ No newline at end of file
-- 
GitLab