From 04780ebacedb365ff56296d4c2807ab13bb0f739 Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 20 Sep 2023 13:31:18 +0200 Subject: [PATCH 1/2] Revert "test" This reverts commit 79624d57c9a0574210e0635124dc01be9a75875f. --- .circleci/config.yml | 192 ++++++++++++++++++++++--------------------- 1 file changed, 98 insertions(+), 94 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index fa619080..1829c630 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,104 +1,108 @@ version: 2.1 orbs: - kubernetes: circleci/kubernetes@1.0.0 - helm: circleci/helm@2.0.1 + kubernetes: circleci/kubernetes@1.0.0 + helm: circleci/helm@2.0.1 jobs: - build-push-docker-image: - docker: - - image: cimg/base:stable - environment: - TAG: << pipeline.git.tag >> - steps: - - checkout - - add_ssh_keys: - fingerprints: - - "39:25:57:64:62:43:1f:98:b1:5e:75:53:87:d8:e7:71" - - run: cp $HOME/.ssh/id_rsa_3925576462431f98b15e755387d8e771 id_rsa - - setup_remote_docker: - version: 20.10.12 - docker_layer_caching: true - - run: docker login rg.fr-par.scw.cloud/lecoffre -u nologin -p $SCW_SECRET_KEY - - run: docker build --tag rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} . - - run: docker push rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} - deploy-docker-image: - docker: - - image: cimg/base:stable - environment: - TAG: << pipeline.git.tag >> - parameters: - env: - type: string - default: stg - steps: - - checkout - - kubernetes/install-kubeconfig: - kubeconfig: KUBECONFIG_DATA - - helm/install-helm-client - - run: - name: Deploy - command: > - helm upgrade - lecoffre-front devops/ -i -f devops/<>.values.yaml - -n lecoffre-<> - --create-namespace - --set lecoffreFront.image.repository='rg.fr-par.scw.cloud/lecoffre/front' - --set lecoffreFront.image.tag=${CIRCLE_SHA1:0:7} + build-push-docker-image: + docker: + - image: cimg/base:stable + environment: + TAG: << pipeline.git.tag >> + steps: + - checkout + - add_ssh_keys: + fingerprints: + - "39:25:57:64:62:43:1f:98:b1:5e:75:53:87:d8:e7:71" + - run: cp $HOME/.ssh/id_rsa_3925576462431f98b15e755387d8e771 id_rsa + - setup_remote_docker: + version: 20.10.12 + docker_layer_caching: true + - run: docker login rg.fr-par.scw.cloud/lecoffre -u nologin -p $SCW_SECRET_KEY + - run: docker build --tag rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} . + - run: docker push rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} + + deploy-docker-image: + docker: + - image: cimg/base:stable + environment: + TAG: << pipeline.git.tag >> + parameters: + env: + type: string + default: stg + steps: + - checkout + - kubernetes/install-kubeconfig: + kubeconfig: KUBECONFIG_DATA + - helm/install-helm-client + - run: + name: Deploy + command: > + helm upgrade + lecoffre-front devops/ -i -f devops/<>.values.yaml + -n lecoffre-<> + --create-namespace + --set lecoffreFront.image.repository='rg.fr-par.scw.cloud/lecoffre/front' + --set lecoffreFront.image.tag=${CIRCLE_SHA1:0:7} + + workflows: - version: 2 - build-and-register-stg: - jobs: - - build-push-docker-image: - context: - - sc-shared-prd - filters: - branches: - only: staging - - deploy-docker-image: - env: stg - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: staging + version: 2 + build-and-register-stg: + jobs: + - build-push-docker-image: + context: + - sc-shared-prd + filters: + branches: + only: staging + - deploy-docker-image: + env: stg + requires: + - build-push-docker-image + context: + - sc-shared-prd + filters: + branches: + only: staging - build-and-register-ppd: - jobs: - - build-push-docker-image: - context: - - sc-shared-prd - filters: - branches: - only: preprod - - deploy-docker-image: - env: ppd - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: preprod + build-and-register-ppd: + jobs: + - build-push-docker-image: + context: + - sc-shared-prd + filters: + branches: + only: preprod + - deploy-docker-image: + env: ppd + requires: + - build-push-docker-image + context: + - sc-shared-prd + filters: + branches: + only: preprod + + build-and-register-prd: + jobs: + - build-push-docker-image: + context: + - sc-shared-prd + filters: + branches: + only: main + - deploy-docker-image: + env: prd + requires: + - build-push-docker-image + context: + - sc-shared-prd + filters: + branches: + only: main - build-and-register-prd: - jobs: - - build-push-docker-image: - context: - - sc-shared-prd - filters: - branches: - only: main - - deploy-docker-image: - env: prd - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: main From c49b342bbaf5938afc676c44863358307137ffc9 Mon Sep 17 00:00:00 2001 From: Vins Date: Wed, 20 Sep 2023 14:13:36 +0200 Subject: [PATCH 2/2] Fixing stg --- .circleci/config.yml | 192 +++++++++++++++++++++---------------------- 1 file changed, 94 insertions(+), 98 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 1829c630..fa619080 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -1,108 +1,104 @@ version: 2.1 orbs: - kubernetes: circleci/kubernetes@1.0.0 - helm: circleci/helm@2.0.1 + kubernetes: circleci/kubernetes@1.0.0 + helm: circleci/helm@2.0.1 jobs: + build-push-docker-image: + docker: + - image: cimg/base:stable + environment: + TAG: << pipeline.git.tag >> + steps: + - checkout + - add_ssh_keys: + fingerprints: + - "39:25:57:64:62:43:1f:98:b1:5e:75:53:87:d8:e7:71" + - run: cp $HOME/.ssh/id_rsa_3925576462431f98b15e755387d8e771 id_rsa + - setup_remote_docker: + version: 20.10.12 + docker_layer_caching: true + - run: docker login rg.fr-par.scw.cloud/lecoffre -u nologin -p $SCW_SECRET_KEY + - run: docker build --tag rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} . + - run: docker push rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} - build-push-docker-image: - docker: - - image: cimg/base:stable - environment: - TAG: << pipeline.git.tag >> - steps: - - checkout - - add_ssh_keys: - fingerprints: - - "39:25:57:64:62:43:1f:98:b1:5e:75:53:87:d8:e7:71" - - run: cp $HOME/.ssh/id_rsa_3925576462431f98b15e755387d8e771 id_rsa - - setup_remote_docker: - version: 20.10.12 - docker_layer_caching: true - - run: docker login rg.fr-par.scw.cloud/lecoffre -u nologin -p $SCW_SECRET_KEY - - run: docker build --tag rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} . - - run: docker push rg.fr-par.scw.cloud/lecoffre/front:${CIRCLE_SHA1:0:7} - - deploy-docker-image: - docker: - - image: cimg/base:stable - environment: - TAG: << pipeline.git.tag >> - parameters: - env: - type: string - default: stg - steps: - - checkout - - kubernetes/install-kubeconfig: - kubeconfig: KUBECONFIG_DATA - - helm/install-helm-client - - run: - name: Deploy - command: > - helm upgrade - lecoffre-front devops/ -i -f devops/<>.values.yaml - -n lecoffre-<> - --create-namespace - --set lecoffreFront.image.repository='rg.fr-par.scw.cloud/lecoffre/front' - --set lecoffreFront.image.tag=${CIRCLE_SHA1:0:7} - - + deploy-docker-image: + docker: + - image: cimg/base:stable + environment: + TAG: << pipeline.git.tag >> + parameters: + env: + type: string + default: stg + steps: + - checkout + - kubernetes/install-kubeconfig: + kubeconfig: KUBECONFIG_DATA + - helm/install-helm-client + - run: + name: Deploy + command: > + helm upgrade + lecoffre-front devops/ -i -f devops/<>.values.yaml + -n lecoffre-<> + --create-namespace + --set lecoffreFront.image.repository='rg.fr-par.scw.cloud/lecoffre/front' + --set lecoffreFront.image.tag=${CIRCLE_SHA1:0:7} workflows: - version: 2 - build-and-register-stg: - jobs: - - build-push-docker-image: - context: - - sc-shared-prd - filters: - branches: - only: staging - - deploy-docker-image: - env: stg - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: staging + version: 2 + build-and-register-stg: + jobs: + - build-push-docker-image: + context: + - sc-shared-prd + filters: + branches: + only: staging + - deploy-docker-image: + env: stg + requires: + - build-push-docker-image + context: + - sc-shared-prd + filters: + branches: + only: staging - build-and-register-ppd: - jobs: - - build-push-docker-image: - context: - - sc-shared-prd - filters: - branches: - only: preprod - - deploy-docker-image: - env: ppd - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: preprod - - build-and-register-prd: - jobs: - - build-push-docker-image: - context: - - sc-shared-prd - filters: - branches: - only: main - - deploy-docker-image: - env: prd - requires: - - build-push-docker-image - context: - - sc-shared-prd - filters: - branches: - only: main + build-and-register-ppd: + jobs: + - build-push-docker-image: + context: + - sc-shared-prd + filters: + branches: + only: preprod + - deploy-docker-image: + env: ppd + requires: + - build-push-docker-image + context: + - sc-shared-prd + filters: + branches: + only: preprod + build-and-register-prd: + jobs: + - build-push-docker-image: + context: + - sc-shared-prd + filters: + branches: + only: main + - deploy-docker-image: + env: prd + requires: + - build-push-docker-image + context: + - sc-shared-prd + filters: + branches: + only: main