push rename Branch

Cour-de-cassation · Jun 25, 2024 · ad9b523 · ad9b523
1 parent 2b7ed5e
commit ad9b523
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 17 deletions.
diff --git a/.github/workflows/test-lint.yml b/.github/workflows/test-lint.yml
@@ -6,13 +6,13 @@ on:
       - dev
       - re7
       - master
-      - osp/deployDev
+      - opsDeployDev
   push:
     branches:
       - dev
       - re7
       - master
-      - osp/deployDev
+      - opsDeployDev
 
 jobs:
   build:

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
@@ -6,8 +6,8 @@ variables:
   dev: dev
   re7: preprod
   master: prod
-  docker_backend_image: "$CI_REGISTRY/cour-de-cassation/label/backend:testdev-$CI_COMMIT_SHORT_SHA"
-  docker_client_image: "$CI_REGISTRY/cour-de-cassation/label/client:testdev-$CI_COMMIT_SHORT_SHA"
+  docker_backend_image: "$CI_REGISTRY/cour-de-cassation/label/backend:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA"
+  docker_client_image: "$CI_REGISTRY/cour-de-cassation/label/client:$CI_COMMIT_BRANCH-$CI_COMMIT_SHORT_SHA"
 
 stages:
   - test
@@ -54,7 +54,7 @@ build_label_backend:
   only:
     - master
     - re7
-    - ops/deployDev
+    - opsDeployDev
     # - dev
   tags:
     - docker
@@ -77,7 +77,7 @@ build_label_client:
   only:
     - master
     - re7
-    - ops/deployDev
+    - opsDeployDev
     # - dev
   tags:
     - docker
@@ -95,7 +95,7 @@ deploy_label_backend:
     - chmod 600 /root/.ssh/known_hosts
     - ansible-playbook -e label_backend_image=$docker_backend_image -i ansible/inventories/$inventaire.yml ansible/deploy_label_backend.yml --vault-password-file=$ANSIBLE_VAULT_PASS
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "re7" || $CI_COMMIT_BRANCH == "ops/deployDev"
+    - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "re7" || $CI_COMMIT_BRANCH == "opsDeployDev"
       when: manual
     - if: $CI_COMMIT_BRANCH == "dev"
       when: on_success
@@ -117,7 +117,7 @@ deploy_label_client:
     - chmod 600 /root/.ssh/known_hosts
     - ansible-playbook -e label_client_image=$docker_client_image -i ansible/inventories/$inventaire.yml ansible/deploy_label_client.yml --vault-password-file=$ANSIBLE_VAULT_PASS
   rules:
-    - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "re7" || $CI_COMMIT_BRANCH == "ops/deployDev"
+    - if: $CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "re7" || $CI_COMMIT_BRANCH == "opsDeployDev"
       when: manual
     - if: $CI_COMMIT_BRANCH == "dev"
       when: on_success

diff --git a/ansible/group_vars/dev/main.yml b/ansible/group_vars/dev/main.yml
@@ -1,4 +1,4 @@
-git_branch: ops/deployDev
+git_branch: opsDeployDev
 
 sder_mongodb_url: "{{ vault_sder_mongodb_url }}"
 label_mongodb_url: "{{ vault_label_mongodb_url }}"

diff --git a/ansible/inventories/dev.yml b/ansible/inventories/dev.yml
@@ -1,8 +1,14 @@
----
-dev:
-  children:
-    k3s_master:
-      hosts:
-        k3s_master_host:
-          ansible_host: 10.16.117.211
-          ansible_ssh_private_key_file: /root/.ssh/id_rsa
+$ANSIBLE_VAULT;1.1;AES256
+63313766356339323166616532636432303333333336636361653630613337613862353830313034
+6537356335653436613436613135343732613739373135360a653235376538303761396364383735
+61393261343239396263336331643266343462303761333139626135313539326363393864346533
+3334633138343130300a326165393735393564616464336334636431636435333035376335393836
+31316138386533353465386264353939356134346638373266396163333562616436346334326366
+37323231613638383135663839643436373130386235326430616663343461396630633434613238
+66393136336234303533663339323062663263373631396632633838663065323731653338643430
+66323930653631636235666363656330653439343364653037656433666334313432363134646162
+32363736663263393064656362376231383166393663376635323561616634613666393836626462
+35303333666465373435373466643732306630373330633334323235343066306335313037333366
+33316666326332643264326531663466636337303830386437626165636134633332333965326634
+61643365663232633239643732656564346636303662636333623533663231383333313162643964
+3432