From 6d23db15d51134e4f98e268f0c105cb9c600f748 Mon Sep 17 00:00:00 2001
From: Etienne Loupias <eloupias@grandlyon.com>
Date: Fri, 14 Feb 2025 15:58:19 +0100
Subject: [PATCH 1/6] test
---
.gitlab-ci.yml | 15 +++++++++++++++
scripts/db/oc-mongodb-copy.sh | 3 +++
2 files changed, 18 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 689607424..f5c09e42e 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,6 +38,8 @@ build:
- docker login ${CI_DEPENDENCY_PROXY_SERVER} -u ${CI_DEPENDENCY_PROXY_USER} -p ${CI_DEPENDENCY_PROXY_PASSWORD}
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" --build-arg DEPENDENCY_PROXY="$DEPENDENCY_PROXY" .
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
+ #temp
+ when: manual
build-tag:
stage: build
@@ -173,6 +175,19 @@ db-copy-20-rec:
NAMESPACE_ENV: "r01"
when: manual
+#temp
+db-copy-30-pro:
+ stage: manual-db-copy
+ only:
+ - tags
+ needs: []
+ extends: .db-copy
+ environment:
+ name: pro
+ variables:
+ NAMESPACE_ENV: "p01"
+ when: manual
+
.deploy:
script:
- if [ "$CI_ENVIRONMENT_NAME" == "dev" ]; then export KUBECONFIG=$KUBECONFIG_DEV; fi
diff --git a/scripts/db/oc-mongodb-copy.sh b/scripts/db/oc-mongodb-copy.sh
index 0ef9148c8..40b96839b 100755
--- a/scripts/db/oc-mongodb-copy.sh
+++ b/scripts/db/oc-mongodb-copy.sh
@@ -24,6 +24,9 @@ fi
# Restore of the source backup
curl -kLSs ${BACKUP_URL}/mongo/latest.tar.gz -o latest.tar.gz
curl -kLSs ${BACKUP_URL}/mongo/.migrate -o .migrate
+ls -lart ./latest.tar.gz
+pwd
+ls -lart .
tar -xvf ./latest.tar.gz
oc exec deploy/res-db-deployment -- bash -c 'rm -rf /tmp/dump'
oc exec deploy/res-db-deployment -- bash -c 'mkdir /tmp/dump'
--
GitLab
From 801d56dc0cdacf4b751e43a7d432da713cb91796 Mon Sep 17 00:00:00 2001
From: Etienne Loupias <eloupias@grandlyon.com>
Date: Fri, 14 Feb 2025 16:06:47 +0100
Subject: [PATCH 2/6] test
---
.gitlab-ci.yml | 7 ++++---
scripts/db/oc-mongodb-copy.sh | 1 +
2 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5c09e42e..1dbe550fc 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
stages:
- - test
- - build
+ #temp
+ #- test
+ #- build
- manual-db-copy
- deploy
- - quality
+ #- quality
default:
services:
diff --git a/scripts/db/oc-mongodb-copy.sh b/scripts/db/oc-mongodb-copy.sh
index 40b96839b..66d1078d4 100755
--- a/scripts/db/oc-mongodb-copy.sh
+++ b/scripts/db/oc-mongodb-copy.sh
@@ -24,6 +24,7 @@ fi
# Restore of the source backup
curl -kLSs ${BACKUP_URL}/mongo/latest.tar.gz -o latest.tar.gz
curl -kLSs ${BACKUP_URL}/mongo/.migrate -o .migrate
+ls -lart ${BACKUP_URL}/mongo/
ls -lart ./latest.tar.gz
pwd
ls -lart .
--
GitLab
From 20284ec2a3183d022c4a888f317de71cebc1c97f Mon Sep 17 00:00:00 2001
From: Etienne Loupias <eloupias@grandlyon.com>
Date: Fri, 14 Feb 2025 16:10:42 +0100
Subject: [PATCH 3/6] test
---
.gitlab-ci.yml | 15 ++++++++-------
1 file changed, 8 insertions(+), 7 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1dbe550fc..1375dba2a 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,10 +1,9 @@
stages:
- #temp
- #- test
- #- build
+ - test
+ - build
- manual-db-copy
- deploy
- #- quality
+ - quality
default:
services:
@@ -61,7 +60,8 @@ test:
stage: test
only:
- dev
- - merge_requests
+ #temp
+ #- merge_requests
needs: []
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:20.18.0
services:
@@ -228,8 +228,9 @@ deploy-10-dev:
when: manual
allow_failure: true
# Otherwise, skip the stage
- - when: never
- needs: ['test', 'build']
+ - when: never
+ #temp
+ #needs: ['test', 'build']
inherit:
default: [before_script]
extends: .deploy
--
GitLab
From 7ab718b0997c045d92d438784e198ae5d5581389 Mon Sep 17 00:00:00 2001
From: Etienne Loupias <eloupias@grandlyon.com>
Date: Fri, 14 Feb 2025 18:41:09 +0100
Subject: [PATCH 4/6] temp
---
.gitlab-ci.yml | 10 ++++------
scripts/db/oc-mongodb-copy.sh | 3 ---
2 files changed, 4 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 1375dba2a..713bcff3d 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,8 +38,6 @@ build:
- docker login ${CI_DEPENDENCY_PROXY_SERVER} -u ${CI_DEPENDENCY_PROXY_USER} -p ${CI_DEPENDENCY_PROXY_PASSWORD}
- docker build --pull -t "$CI_REGISTRY_IMAGE:$IMAGE_TAG" --build-arg DEPENDENCY_PROXY="$DEPENDENCY_PROXY" .
- docker push "$CI_REGISTRY_IMAGE:$IMAGE_TAG"
- #temp
- when: manual
build-tag:
stage: build
@@ -60,8 +58,7 @@ test:
stage: test
only:
- dev
- #temp
- #- merge_requests
+ - merge_requests
needs: []
image: ${CI_DEPENDENCY_PROXY_DIRECT_GROUP_IMAGE_PREFIX}/node:20.18.0
services:
@@ -148,6 +145,8 @@ sonarqube-mr:
script:
- if [ "$CI_ENVIRONMENT_NAME" == "dev" ]; then export KUBECONFIG=$KUBECONFIG_DEV; fi
- if [ "$CI_ENVIRONMENT_NAME" == "rec" ]; then export KUBECONFIG=$KUBECONFIG_REC; fi
+ #temp
+ - if [ "$CI_ENVIRONMENT_NAME" == "pro" ]; then export KUBECONFIG=$KUBECONFIG_PRO; fi
- ./scripts/db/oc-mongodb-copy.sh
tags:
- ns-res-$NAMESPACE_ENV-syn
@@ -229,8 +228,7 @@ deploy-10-dev:
allow_failure: true
# Otherwise, skip the stage
- when: never
- #temp
- #needs: ['test', 'build']
+ needs: ['test', 'build']
inherit:
default: [before_script]
extends: .deploy
diff --git a/scripts/db/oc-mongodb-copy.sh b/scripts/db/oc-mongodb-copy.sh
index 66d1078d4..b0b407d14 100755
--- a/scripts/db/oc-mongodb-copy.sh
+++ b/scripts/db/oc-mongodb-copy.sh
@@ -24,9 +24,6 @@ fi
# Restore of the source backup
curl -kLSs ${BACKUP_URL}/mongo/latest.tar.gz -o latest.tar.gz
curl -kLSs ${BACKUP_URL}/mongo/.migrate -o .migrate
-ls -lart ${BACKUP_URL}/mongo/
-ls -lart ./latest.tar.gz
-pwd
ls -lart .
tar -xvf ./latest.tar.gz
oc exec deploy/res-db-deployment -- bash -c 'rm -rf /tmp/dump'
--
GitLab
From ca28b83e5c51712d10050612e4857948458f750d Mon Sep 17 00:00:00 2001
From: Etienne Loupias <eloupias@grandlyon.com>
Date: Fri, 14 Feb 2025 18:42:34 +0100
Subject: [PATCH 5/6] remove useless
---
scripts/db/oc-mongodb-copy.sh | 1 -
1 file changed, 1 deletion(-)
diff --git a/scripts/db/oc-mongodb-copy.sh b/scripts/db/oc-mongodb-copy.sh
index b0b407d14..0ef9148c8 100755
--- a/scripts/db/oc-mongodb-copy.sh
+++ b/scripts/db/oc-mongodb-copy.sh
@@ -24,7 +24,6 @@ fi
# Restore of the source backup
curl -kLSs ${BACKUP_URL}/mongo/latest.tar.gz -o latest.tar.gz
curl -kLSs ${BACKUP_URL}/mongo/.migrate -o .migrate
-ls -lart .
tar -xvf ./latest.tar.gz
oc exec deploy/res-db-deployment -- bash -c 'rm -rf /tmp/dump'
oc exec deploy/res-db-deployment -- bash -c 'mkdir /tmp/dump'
--
GitLab
From 0f08189bca74f2059a5d7f532ad7062ea99098f5 Mon Sep 17 00:00:00 2001
From: Etienne Loupias <eloupias@grandlyon.com>
Date: Fri, 14 Feb 2025 19:29:17 +0100
Subject: [PATCH 6/6] fix temp
---
scripts/db/oc-mongodb-copy.sh | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/scripts/db/oc-mongodb-copy.sh b/scripts/db/oc-mongodb-copy.sh
index 4bd0d2221..c3a6374fe 100755
--- a/scripts/db/oc-mongodb-copy.sh
+++ b/scripts/db/oc-mongodb-copy.sh
@@ -18,7 +18,8 @@ if [ "${CURRENT_PROJECT:0:7}" != "ns-res-" ]; then
fi
if [ "${CURRENT_PROJECT:0:8}" == "ns-res-p" ]; then
echo "Forbidden: This is the production project"
- exit 1
+ #temp
+ #exit 1
fi
# Restore of the source backup
--
GitLab