From 3659bc5f367a34305541ed9ddec4638ee8d5cb5e Mon Sep 17 00:00:00 2001
From: Daniel Pawlik <dpawlik@redhat.com>
Date: May 09 2022 12:07:26 +0000
Subject: Update config playbook to be compatible with SF 3.7


---

diff --git a/playbooks/config/check.yaml b/playbooks/config/check.yaml
index 5280c11..7996935 100644
--- a/playbooks/config/check.yaml
+++ b/playbooks/config/check.yaml
@@ -69,7 +69,7 @@
       no_log: true
 
     - name: Check resources changes
-      shell: env - REQUESTS_CA_BUNDLE=/etc/ssl/certs/ca-bundle.crt /usr/bin/managesf-resources remote-validate --remote-gateway {{ gateway_url }}
+      shell: managesf-resources remote-validate --remote-gateway {{ gateway_url }}
       args:
         chdir: "{{ config_root }}"
 
@@ -90,15 +90,6 @@
       args:
         chdir: "{{ config_root }}"
 
-    - name: Validate repoxplorer configuration
-      block:
-        - name: Check syntax errors in repoxplorer definition files
-          command: >
-            env - /bin/repoxplorer-config-validate --config {{ config_root }}/defconf/defconf-repoxplorer.py
-          args:
-            chdir: "{{ config_root }}"
-      when: '"repoxplorer" in arch.roles'
-
     - name: Check nodepool dhall configuration
       shell: |
         for dhall_conf in $(ls nodepool/*.dhall 2> /dev/null); do
@@ -128,18 +119,18 @@
           block:
             - name: Generate configuration
               command: >
-                env - /bin/managesf-configuration nodepool
-                  --cache-dir {{ config_root }}/../.cache
-                  {% if item != arch.launcher_hosts[0] %}--extra-launcher {% endif %}
-                  --hostname {{ item }}
-                  --config-dir {{ config_root }} --output build/nodepool-{{ item }}.yaml
+                managesf-configuration nodepool
+                --cache-dir {{ config_root }}/../.cache
+                {% if item != arch.launcher_hosts[0] %}--extra-launcher {% endif %}
+                --hostname {{ item }}
+                --config-dir {{ config_root }} --output build/nodepool-{{ item }}.yaml
               args:
                 chdir: "{{ config_root }}"
               loop: "{{ arch.launcher_hosts }}"
 
             - name: Run nodepool config-validate for nodepool-launchers
               command: >
-                env - /bin/nodepool -c build/nodepool-{{ item }}.yaml config-validate
+                nodepool -c build/nodepool-{{ item }}.yaml config-validate
               args:
                 chdir: "{{ config_root }}"
               loop: "{{ arch.launcher_hosts }}"
@@ -147,21 +138,21 @@
 
         - name: Merge nodepool-builder config repo files
           command: >
-            env - /bin/managesf-configuration nodepool
-               --cache-dir {{ config_root }}/../.cache --builder --config-dir {{ config_root }} --output build/nodepool-builder.yaml
+            managesf-configuration nodepool
+            --cache-dir {{ config_root }}/../.cache --builder
+            --config-dir {{ config_root }} --output build/nodepool-builder.yaml
           args:
             chdir: "{{ config_root }}"
 
         - name: Run nodepool config-validate for nodepool-builder
           command: >
-            env - /bin/nodepool -c build/nodepool-builder.yaml
-                config-validate
+            nodepool -c build/nodepool-builder.yaml config-validate
           args:
             chdir: "{{ config_root }}"
 
         - name: Run nodepool config-validate for static configuration
           command: >
-            env - find nodepool/static_config/ -name '*.yaml' -exec /bin/nodepool -c {} config-validate \;
+            find nodepool/static_config/ -name '*.yaml' -exec nodepool -c {} config-validate \;
           args:
             chdir: "{{ config_root }}"
       when:
@@ -177,14 +168,17 @@
 
         - name: Merge zuul tenant config
           command: >
-            env - /bin/managesf-configuration zuul
-               --cache-dir {{ config_root }}/../.cache --config-dir {{ config_root }} --gateway-url {{ gateway_url }} {{ tenant_options | default('') }} --output build/main.yaml
+            managesf-configuration zuul
+            --cache-dir {{ config_root }}/../.cache
+            --config-dir {{ config_root }}
+            --gateway-url {{ gateway_url }} {{ tenant_options | default('') }}
+            --output build/main.yaml
           args:
             chdir: "{{ config_root }}"
 
         - name: Validate zuul config syntax
           command: >
-            env - /bin/zuul -c zuul.conf tenant-conf-check
+            env - /usr/local/bin/zuul -c zuul.conf tenant-conf-check
           args:
             chdir: "{{ config_root }}/build"