Merge branch 'main' into issue/541-volume-backup-standard

.github/workflows/scs-compliance-check-with-application-credential.yml

@@ -34,7 +34,7 @@ jobs:
           EOF
       - name: "Clean up any lingering resources from previous run"
         if: ${{ inputs.layer == 'iaas' && inputs.version == 'v4' }}
-        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs-"
+        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs- --ipaddr 10.1.0. --debug"
       - name: "Run scs-compliance-check"
         run: "cd /scs-compliance && ./scs-compliance-check.py scs-compatible-${{ inputs.layer }}.yaml --version ${{ inputs.version }} -o result.yaml -s ${{ inputs.cloud }} -a os_cloud=${{ inputs.cloud }}"
       - name: "Upload results"

.github/workflows/scs-compliance-check.yml

@@ -34,7 +34,7 @@ jobs:
           EOF
       - name: "Clean up any lingering resources from previous run"
         if: ${{ inputs.layer == 'iaas' && inputs.version == 'v4' }}
-        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs-"
+        run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs- --ipaddr 10.1.0. --debug"
       - name: "Run scs-compliance-check"
         run: "cd /scs-compliance && ./scs-compliance-check.py scs-compatible-${{ inputs.layer }}.yaml --version ${{ inputs.version }} -o result.yaml -s ${{ inputs.cloud }} -a os_cloud=${{ inputs.cloud }}"
       - name: "Upload results"

.zuul.d/config.yaml

@@ -5,17 +5,7 @@
     merge-mode: "squash-merge"
     periodic-daily:
       jobs:
-        - scs-check-artcodix
-        - scs-check-pco-prod1
-        - scs-check-pco-prod2
-        - scs-check-pco-prod3
-        - scs-check-pco-prod4
-        - scs-check-poc-kdo
-        - scs-check-poc-wgcloud
-        - scs-check-regio-a
-        - scs-check-syseleven-dus2
-        - scs-check-syseleven-ham1
-        - scs-check-wavestack
+        - scs-check-all
     periodic-hourly:
       jobs:
         - scs-check-gx-scs-main
@@ -37,8 +27,7 @@
      - name: clouds_conf
        secret: SECRET_STANDARDS
     vars:
-      cloud: gx-scs
-      secret_key: gx_scs_key
+      preset: default
     pre-run:
      - playbooks/pre.yaml
      - playbooks/pre_cloud.yaml
@@ -48,68 +37,7 @@
     parent: scs-check-gx-scs
     branches: main
 - job:
-    name: scs-check-artcodix
+    name: scs-check-all
     parent: scs-check-gx-scs-main
     vars:
-      cloud: artcodix
-      secret_key: cnds_key
-- job:
-    name: scs-check-pco-prod4
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: pco-prod4
-      secret_key: pco_prod4_key
-- job:
-    name: scs-check-pco-prod3
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: pco-prod3
-      secret_key: pco_prod3_key
-- job:
-    name: scs-check-pco-prod2
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: pco-prod2
-      secret_key: pco_prod2_key
-- job:
-    name: scs-check-pco-prod1
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: pco-prod1
-      secret_key: pco_prod1_key
-- job:
-    name: scs-check-poc-kdo
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: poc-kdo
-      secret_key: poc_kdo_key
-- job:
-    name: scs-check-poc-wgcloud
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: poc-wgcloud
-      secret_key: poc_wgcloud_key
-- job:
-    name: scs-check-regio-a
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: regio-a
-      secret_key: regio_a_key
-- job:
-    name: scs-check-syseleven-dus2
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: syseleven-dus2
-      secret_key: syseleven_dus2_key
-- job:
-    name: scs-check-syseleven-ham1
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: syseleven-ham1
-      secret_key: syseleven_ham1_key
-- job:
-    name: scs-check-wavestack
-    parent: scs-check-gx-scs-main
-    vars:
-      cloud: wavestack
-      secret_key: wavestack_key
+      preset: all