Merge "ci - use deploy/config instead of /tmp/config"

doc/developer/howtos/index.md

@@ -34,21 +34,10 @@ This Prometheus instance is configured to collect metrics from a deployed Softwa
 
 ## How to open a review on the test Gerrit
 
-First checkout the **config** repository.
-
-```sh
-# Get the Gerrit admin user API key
-gerrit_admin_api_key=$(./tools/get-secret.sh gerrit-admin-api-key)
-# Then checkout the config repository
-git -c http.sslVerify=false clone "https://admin:${gerrit_admin_api_key}@gerrit.sfop.me/a/config" /tmp/config
-cd /tmp/config
-git config http.sslverify false
-git remote add gerrit "https://admin:${gerrit_admin_api_key}@gerrit.sfop.me/a/config"
-```
-
-Then add a change and send the review:
+The checkout of the **config** repository is done by the `dev prepare` command.
 
 ```sh
+cd deploy/config
 touch myfile
 git add myfile && git commit -m"Add myfile"
 git review

playbooks/group_vars/all.yaml

@@ -1,5 +1,5 @@
 ---
-config_path: /tmp/config
+config_path: "{{ zuul.project.src_dir }}/deploy/config"
 fqdn: sfop.me
 
 validate_certs: false

roles/health-check/config-update-nodepool-builder/tasks/main.yaml

@@ -24,7 +24,7 @@
   args:
     chdir: "{{ config_path }}"
   loop:
-    - "git add {{ config_path }}/nodepool/nodepool-builder.yaml"
+    - "git add nodepool/nodepool-builder.yaml"
     - "git commit -m 'Add nodepool/nodepool-builder.yaml'"
 
 - ansible.builtin.include_role:
@@ -126,9 +126,9 @@
   args:
     chdir: "{{ config_path }}"
   loop:
-    - "git add {{ config_path }}/nodepool/nodepool-builder.yaml"
-    - "git add {{ config_path }}/nodepool/dib-ansible/dummy.yaml"
-    - "git add {{ config_path }}/nodepool/dib-ansible/inventory.yaml"
+    - "git add nodepool/nodepool-builder.yaml"
+    - "git add nodepool/dib-ansible/dummy.yaml"
+    - "git add nodepool/dib-ansible/inventory.yaml"
     - "git commit -m 'Add nodepool builder image config'"
 
 - name: Update config repo change
@@ -163,4 +163,4 @@
     kubectl exec nodepool-builder-0 -- bash -c "grep 'in callback plugin' /var/lib/nodepool/builds/logs/*"
   register: timestamp_error
   failed_when: timestamp_error is success
-  ignore_errors: true
+  ignore_errors: true

roles/health-check/config-update-nodepool-launcher/tasks/main.yaml

@@ -21,7 +21,7 @@
   args:
     chdir: "{{ config_path }}"
   loop:
-    - "git add {{ config_path }}/nodepool/nodepool.yaml"
+    - "git add nodepool/nodepool.yaml"
     - "git commit -m 'Add nodepool/nodepool.yaml'"
 
 - ansible.builtin.include_role:
@@ -113,7 +113,7 @@
   args:
     chdir: "{{ config_path }}"
   loop:
-    - "git add {{ config_path }}/nodepool/nodepool.yaml"
+    - "git add nodepool/nodepool.yaml"
     - "git commit -m 'Add nodepool/nodepool.yaml'"
 
 - name: Update config repo change

roles/health-check/config-update-zuul/tasks/main.yaml

@@ -32,8 +32,8 @@
   args:
     chdir: "{{ config_path }}"
   loop:
-    - "git add {{ config_path }}/zuul/main.yaml"
-    - "git commit -m 'Add {{ config_path }}/zuul/main.yaml'"
+    - "git add zuul/main.yaml"
+    - "git commit -m 'Add zuul/main.yaml'"
 
 - ansible.builtin.include_role:
     name: "health-check/config-repo-submit-change"
@@ -58,7 +58,7 @@
   args:
     chdir: "{{ config_path }}"
   loop:
-    - "git add {{ config_path }}/zuul/main.yaml"
+    - "git add zuul/main.yaml"
     - "git commit --amend --no-edit"
 
 - name: Submit change and verify Zuul console output

roles/run-tests/tasks/main.yaml

@@ -12,7 +12,7 @@
       when: "{{ mode == 'standalone' }}"
     - name: utils/manage-hosts
     - name: utils/get-gerrit-admin-user-api-key
-    - name: utils/config-repo-get-or-reset
+    - name: utils/config-repo-reset
   loop_control:
     loop_var: role
 

roles/utils/config-repo-reset/tasks/main.yml

@@ -0,0 +1,14 @@
+---
+- name: Config repo, reset
+  ansible.builtin.command: "{{ git_cmd }}"
+  args:
+    chdir: "{{ config_path }}"
+  loop:
+    - git fetch --all
+    - git checkout master
+    - git reset --hard origin/master --
+    - git clean -f -d
+  loop_control:
+    loop_var: git_cmd
+  tags:
+    - skip_ansible_lint