Merge branch 'main' into mandatory-and-supported-IaaS-services

SovereignCloudStack · Jun 21, 2024 · 5343407 · 5343407
2 parents 7905024 + c3aaae5
commit 5343407
Show file tree

Hide file tree

Showing 45 changed files with 3,033 additions and 606 deletions.
diff --git a/.github/scs-compliance-check/openstack/clouds.yaml b/.github/scs-compliance-check/openstack/clouds.yaml
@@ -73,6 +73,14 @@ clouds:
       auth_url: https://api.dc1.muc.cloud.cnds.io:5000/
       application_credential_id: "39a5bf194c6e4b0d8348d28e55136750"
       #project_id: 225a7363dab74b69aa1e3f744aced109
+  poc-kdo:
+    interface: public
+    identity_api_verion: 3
+    auth_type: "v3applicationcredential"
+    auth:
+      auth_url: https://keystone.services.poc-kdo.fitko.sovereignit.cloud
+      application_credential_id: "248684b7a3da4dc786fbe65592f165be"
+    region_name: "RegionOne"
   poc-wgcloud:
     interface: public
     identity_api_verion: 3
@@ -81,3 +89,19 @@ clouds:
     auth:
       auth_url: https://identity.l1a.cloudandheat.com/v3
       application_credential_id: "7ab4e3339ea04255bc131868974cfe63"
+  syseleven-dus2:
+    interface: public
+    identity_api_verion: 3
+    auth_type: "v3applicationcredential"
+    region_name: dus2
+    auth:
+      auth_url: https://keystone.cloud.syseleven.net:5000/v3
+      application_credential_id: s11auth
+  syseleven-ham1:
+    interface: public
+    identity_api_verion: 3
+    auth_type: "v3applicationcredential"
+    region_name: ham1
+    auth:
+      auth_url: https://keystone.cloud.syseleven.net:5000/v3
+      application_credential_id: s11auth
diff --git a/.github/workflows/build-docker.yml b/.github/workflows/build-docker.yml
@@ -22,23 +22,23 @@ jobs:
 
     steps:
       - name: Checkout repository
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: Log in to the Container registry
-        uses: docker/login-action@v2
+        uses: docker/login-action@v3
         with:
           registry: ${{ env.REGISTRY }}
           username: ${{ github.actor }}
           password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: Extract metadata (tags, labels) for Docker
         id: meta
-        uses: docker/metadata-action@v4
+        uses: docker/metadata-action@v5
         with:
           images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
 
       - name: Build and push Docker image
-        uses: docker/build-push-action@v3
+        uses: docker/build-push-action@v5
         with:
           context: "./Tests/"
           push: true

diff --git a/.github/workflows/check-poc-kdo-v4.yml b/.github/workflows/check-poc-kdo-v4.yml
@@ -0,0 +1,23 @@
+name: "Compliance IaaS v4 of poc-kdo"
+
+on:
+  # Trigger compliance check every day at 4:22 UTC
+  schedule:
+    - cron:  '22 4 * * *'
+  # Trigger compliance check after Docker image has been built
+  workflow_run:
+    workflows: [Build and publish scs-compliance-check Docker image]
+    types:
+      - completed
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  check-poc-kdo:
+    uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
+    with:
+      version: v4
+      layer: iaas
+      cloud: "poc-kdo"
+      secret_name: "OS_PASSWORD_POC_KDO"
+    secrets: inherit
diff --git a/.github/workflows/check-syseleven-dus2-v3.yml b/.github/workflows/check-syseleven-dus2-v3.yml
@@ -0,0 +1,23 @@
+name: "Compliance IaaS v3 of syseleven dus2 region"
+
+on:
+  # Trigger compliance check every day at 4:08 UTC
+  schedule:
+    - cron:  '08 4 * * *'
+  # Trigger compliance check after Docker image has been built
+  workflow_run:
+    workflows: [Build and publish scs-compliance-check Docker image]
+    types:
+      - completed
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  check-syseleven-dus2:
+    uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
+    with:
+      version: v3
+      layer: iaas
+      cloud: "syseleven-dus2"
+      secret_name: "OS_PASSWORD_SYSELEVEN_DUS2"
+    secrets: inherit
diff --git a/.github/workflows/check-syseleven-dus2-v4.yml b/.github/workflows/check-syseleven-dus2-v4.yml
@@ -0,0 +1,23 @@
+name: "Compliance IaaS v4 of syseleven dus2 region"
+
+on:
+  # Trigger compliance check every day at 4:10 UTC
+  schedule:
+    - cron:  '10 4 * * *'
+  # Trigger compliance check after Docker image has been built
+  workflow_run:
+    workflows: [Build and publish scs-compliance-check Docker image]
+    types:
+      - completed
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  check-syseleven-dus2:
+    uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
+    with:
+      version: v4
+      layer: iaas
+      cloud: "syseleven-dus2"
+      secret_name: "OS_PASSWORD_SYSELEVEN_DUS2"
+    secrets: inherit
diff --git a/.github/workflows/check-syseleven-ham1-v3.yml b/.github/workflows/check-syseleven-ham1-v3.yml
@@ -0,0 +1,23 @@
+name: "Compliance IaaS v3 of syseleven ham1 region"
+
+on:
+  # Trigger compliance check every day at 4:09 UTC
+  schedule:
+    - cron:  '09 4 * * *'
+  # Trigger compliance check after Docker image has been built
+  workflow_run:
+    workflows: [Build and publish scs-compliance-check Docker image]
+    types:
+      - completed
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  check-syseleven-ham1:
+    uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
+    with:
+      version: v3
+      layer: iaas
+      cloud: "syseleven-ham1"
+      secret_name: "OS_PASSWORD_SYSELEVEN_HAM1"
+    secrets: inherit
diff --git a/.github/workflows/check-syseleven-ham1-v4.yml b/.github/workflows/check-syseleven-ham1-v4.yml
@@ -0,0 +1,23 @@
+name: "Compliance IaaS v4 of syseleven ham1 region"
+
+on:
+  # Trigger compliance check every day at 4:15 UTC
+  schedule:
+    - cron:  '15 4 * * *'
+  # Trigger compliance check after Docker image has been built
+  workflow_run:
+    workflows: [Build and publish scs-compliance-check Docker image]
+    types:
+      - completed
+  # Allows you to run this workflow manually from the Actions tab
+  workflow_dispatch:
+
+jobs:
+  check-syseleven-ham1:
+    uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
+    with:
+      version: v4
+      layer: iaas
+      cloud: "syseleven-ham1"
+      secret_name: "OS_PASSWORD_SYSELEVEN_HAM1"
+    secrets: inherit
diff --git a/.github/workflows/create-flavors-spec.yml b/.github/workflows/create-flavors-spec.yml
@@ -13,7 +13,7 @@ jobs:
   default:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
       with:
         token: ${{ secrets.FLAVORS_SPEC_PAT }}
     - name: Set up Python 3.10.5

diff --git a/.github/workflows/link-validator.yml b/.github/workflows/link-validator.yml
@@ -15,7 +15,7 @@ jobs:
   markdown-link-check:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v3
+    - uses: actions/checkout@v4
     - uses: gaurav-nelson/github-action-markdown-link-check@1.0.15
       with:
         use-quiet-mode: 'yes'

diff --git a/.github/workflows/scs-compliance-check-with-application-credential.yml b/.github/workflows/scs-compliance-check-with-application-credential.yml
@@ -35,7 +35,7 @@ jobs:
       - 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"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: result
           path: /scs-compliance/result.yaml
diff --git a/.github/workflows/scs-compliance-check.yml b/.github/workflows/scs-compliance-check.yml
@@ -15,7 +15,7 @@ on:
       secret_name:
         required: true
         type: string
-  
+
 jobs:
   scs-compliance-check:
     runs-on: ubuntu-latest
@@ -35,7 +35,7 @@ jobs:
       - 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"
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: result
           path: /scs-compliance/result.yaml
diff --git a/.zuul.d/config.yaml b/.zuul.d/config.yaml
@@ -5,10 +5,16 @@
     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
     periodic-hourly:
       jobs:
@@ -32,6 +38,7 @@
        secret: SECRET_STANDARDS
     vars:
       cloud: gx-scs
+      secret_key: gx_scs_key
     pre-run:
      - playbooks/pre.yaml
      - playbooks/pre_cloud.yaml
@@ -40,28 +47,69 @@
     name: scs-check-gx-scs-main
     parent: scs-check-gx-scs
     branches: main
+- job:
+    name: scs-check-artcodix
+    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