From d99e4512ed74af409f5c28d77b397bef179edc15 Mon Sep 17 00:00:00 2001
From: Remi PLANEL <rplanel@pasteur.fr>
Date: Fri, 22 Dec 2023 11:42:05 +0100
Subject: [PATCH] remove useless stages
---
.gitlab-ci.yml | 179 ++++++++++++++++++++++++-------------------------
1 file changed, 89 insertions(+), 90 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 4d7cad01..38a41936 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -40,9 +40,9 @@ stages:
- update-meilisearch-indexes
- get-meili-key
- build
- - build-wiki
+ # - build-wiki
- deploy
- - load-website
+ # - load-website
.docker-login: &docker-login
- i=0; while [ "$i" -lt 12 ]; do docker info && break; sleep 5; i=$(( i + 1 )) ; done
@@ -354,95 +354,94 @@ build:prod:wiki:
- if: $CI_COMMIT_BRANCH == "main"
-build-wiki:dev:
- stage: build-wiki
- needs:
- - set-meili-env:dev
- rules:
- - if: $CI_COMMIT_BRANCH != "main"
- image: node:21.1-bookworm-slim
- variables:
- NODE_OPTIONS: --max_old_space_size=12288
- NUXT_APP_BASE_URL: /wiki/
- NUXT_PUBLIC_MEILISEARCH_CLIENT_HOST_URL: ${MEILI_HOST}
- NUXT_PUBLIC_MEILISEARCH_CLIENT_SEARCH_API_KEY: ${MEILI_API_KEY}
- NUXT_PUBLIC_MEILI_HOST: ${MEILI_HOST}
- NUXT_PUBLIC_MEILI_API_KEY: ${MEILI_API_KEY}
- before_script:
- - npm install
- script:
- - npm run generate
- artifacts:
- paths:
- - .output/public
-
-build-wiki:prod:
- stage: build-wiki
- rules:
- - if: $CI_COMMIT_BRANCH == "main"
- needs:
- - set-meili-env:prod
- - get-zotero
- image: node:21.1-bookworm-slim
- variables:
- NODE_OPTIONS: --max_old_space_size=12288
- NUXT_APP_BASE_URL: /wiki/
- NUXT_PUBLIC_MEILISEARCH_CLIENT_HOST_URL: ${MEILI_HOST}
- NUXT_PUBLIC_MEILISEARCH_CLIENT_SEARCH_API_KEY: ${MEILI_API_KEY}
- NUXT_PUBLIC_MEILI_HOST: ${MEILI_HOST}
- NUXT_PUBLIC_MEILI_API_KEY: ${MEILI_API_KEY}
- before_script:
- - npm install
- script:
- - npm run generate
- artifacts:
- paths:
- - .output/public
-
-
-load-website:dev:
- image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
- stage: load-website
- needs:
- - build-wiki:dev
- - deploy:dev
- variables:
- NAMESPACE: "defense-finder-dev"
- environment:
- name: "k8sdev-01"
- 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
- - |
- kubectl --namespace ${NAMESPACE}
- exec ${WIKI_POD} -- bash -c 'cd /structure-data/sanitized-dump && find * -type d -exec sh -c "for d in "$@"; do (cd "/usr/share/nginx/html/$d"; cp --archive --recursive --symbolic-link /structure-data/sanitized-dump/$d/* .) done" argv0 {} +'
-
-
-load-website:prod:
- image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
- stage: load-website
- needs:
- - build-wiki:prod
- - deploy: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}')
+# build-wiki:dev:
+# stage: build-wiki
+# needs:
+# - set-meili-env:dev
+# rules:
+# - if: $CI_COMMIT_BRANCH != "main"
+# image: node:21.1-bookworm-slim
+# variables:
+# NODE_OPTIONS: --max_old_space_size=12288
+# NUXT_APP_BASE_URL: /wiki/
+# NUXT_PUBLIC_MEILISEARCH_CLIENT_HOST_URL: ${MEILI_HOST}
+# NUXT_PUBLIC_MEILISEARCH_CLIENT_SEARCH_API_KEY: ${MEILI_API_KEY}
+# NUXT_PUBLIC_MEILI_HOST: ${MEILI_HOST}
+# NUXT_PUBLIC_MEILI_API_KEY: ${MEILI_API_KEY}
+# before_script:
+# - npm install
+# script:
+# - npm run generate
+# artifacts:
+# paths:
+# - .output/public
+
+# build-wiki:prod:
+# stage: build-wiki
+# rules:
+# - if: $CI_COMMIT_BRANCH == "main"
+# needs:
+# - set-meili-env:prod
+# - get-zotero
+# image: node:21.1-bookworm-slim
+# variables:
+# NODE_OPTIONS: --max_old_space_size=12288
+# NUXT_APP_BASE_URL: /wiki/
+# NUXT_PUBLIC_MEILISEARCH_CLIENT_HOST_URL: ${MEILI_HOST}
+# NUXT_PUBLIC_MEILISEARCH_CLIENT_SEARCH_API_KEY: ${MEILI_API_KEY}
+# NUXT_PUBLIC_MEILI_HOST: ${MEILI_HOST}
+# NUXT_PUBLIC_MEILI_API_KEY: ${MEILI_API_KEY}
+# before_script:
+# - npm install
+# script:
+# - npm run generate
+# artifacts:
+# paths:
+# - .output/public
+
+
+# load-website:dev:
+# image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
+# stage: load-website
+# needs:
+# - build-wiki:dev
+# - deploy:dev
+# variables:
+# NAMESPACE: "defense-finder-dev"
+# environment:
+# name: "k8sdev-01"
+# 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
+# - |
+# kubectl --namespace ${NAMESPACE}
+# exec ${WIKI_POD} -- bash -c 'cd /structure-data/sanitized-dump && find * -type d -exec sh -c "for d in "$@"; do (cd "/usr/share/nginx/html/$d"; cp --archive --recursive --symbolic-link /structure-data/sanitized-dump/$d/* .) done" argv0 {} +'
+
+
+# load-website:prod:
+# image: harbor.pasteur.fr/kube-system/helm-kubectl:$HELM_VERSION
+# stage: load-website
+# needs:
+# - build-wiki:prod
+# - deploy: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
- - kubectl --namespace ${NAMESPACE} cp scripts/copy-structure-data.sh ${WIKI_POD}:/structure-data/sanitized-dump
- - kubectl --namespace ${NAMESPACE} exec ${WIKI_POD} -- bash -c 'cd /structure-data/sanitized-dump && bash copy-structure-data.sh'
- # - kubectl --namespace ${NAMESPACE} exec ${WIKI_POD} -- bash -c 'cd /structure-data/sanitized-dump && find * -type d -exec sh -c "for d in $@; do (cd /usr/share/nginx/html/$d; cp --archive --recursive --symbolic-link /structure-data/sanitized-dump/$d/* .) done" argv0 {} +'
+# - kubectl --namespace ${NAMESPACE} cp .output/public/ ${WIKI_POD}:/website
+# - kubectl --namespace ${NAMESPACE} cp scripts/copy-structure-data.sh ${WIKI_POD}:/structure-data/sanitized-dump
+# - kubectl --namespace ${NAMESPACE} exec ${WIKI_POD} -- bash -c 'cd /structure-data/sanitized-dump && bash copy-structure-data.sh'
--
GitLab