Skip to content

Commit 96ee133

Browse files
garloffgarloff
authored
Merge branch 'main' into standard-roles-revisited
2 parents 688da00 + 3274fff commit 96ee133

File tree

172 files changed

+10834
-2975
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

172 files changed

+10834
-2975
lines changed

‎.github/scs-compliance-check/openstack/clouds.yaml‎

Lines changed: 35 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -71,14 +71,45 @@ clouds:
7171
#region_name: "MUC"
7272
auth:
7373
auth_url: https://api.dc1.muc.cloud.cnds.io:5000/
74-
application_credential_id: "f3102a98821641c19d8ea762dc64b0b0"
74+
application_credential_id: "39a5bf194c6e4b0d8348d28e55136750"
7575
#project_id: 225a7363dab74b69aa1e3f744aced109
76+
poc-kdo:
77+
interface: public
78+
identity_api_verion: 3
79+
auth_type: "v3applicationcredential"
80+
auth:
81+
auth_url: https://keystone.services.poc-kdo.fitko.sovereignit.cloud
82+
application_credential_id: "248684b7a3da4dc786fbe65592f165be"
83+
region_name: "RegionOne"
7684
poc-wgcloud:
7785
interface: public
7886
identity_api_verion: 3
7987
auth_type: "v3applicationcredential"
8088
#region_name: default
8189
auth:
82-
auth_url: https://identity.l1.cloudandheat.com/v3
83-
application_credential_id: "b4844a0fb23247149997bf0ff2c0b156"
84-
#project_id: 9adb8fc81ba345178654cee5cb7f1464
90+
auth_url: https://identity.l1a.cloudandheat.com/v3
91+
application_credential_id: "7ab4e3339ea04255bc131868974cfe63"
92+
scaleup-occ2:
93+
auth_type: v3applicationcredential
94+
auth:
95+
auth_url: https://keystone.occ2.scaleup.cloud
96+
application_credential_id: "5d2eea4e8bf8448092490b4190d4430a"
97+
region_name: "RegionOne"
98+
interface: "public"
99+
identity_api_version: 3
100+
syseleven-dus2:
101+
interface: public
102+
identity_api_verion: 3
103+
auth_type: "v3applicationcredential"
104+
region_name: dus2
105+
auth:
106+
auth_url: https://keystone.cloud.syseleven.net:5000/v3
107+
application_credential_id: s11auth
108+
syseleven-ham1:
109+
interface: public
110+
identity_api_verion: 3
111+
auth_type: "v3applicationcredential"
112+
region_name: ham1
113+
auth:
114+
auth_url: https://keystone.cloud.syseleven.net:5000/v3
115+
application_credential_id: s11auth

‎.github/workflows/build-docker.yml‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,23 +22,23 @@ jobs:
2222

2323
steps:
2424
- name: Checkout repository
25-
uses: actions/checkout@v3
25+
uses: actions/checkout@v4
2626

2727
- name: Log in to the Container registry
28-
uses: docker/login-action@v2
28+
uses: docker/login-action@v3
2929
with:
3030
registry: ${{ env.REGISTRY }}
3131
username: ${{ github.actor }}
3232
password: ${{ secrets.GITHUB_TOKEN }}
3333

3434
- name: Extract metadata (tags, labels) for Docker
3535
id: meta
36-
uses: docker/metadata-action@v4
36+
uses: docker/metadata-action@v5
3737
with:
3838
images: ${{ env.REGISTRY }}/${{ github.repository_owner }}/${{ env.IMAGE_NAME }}
3939

4040
- name: Build and push Docker image
41-
uses: docker/build-push-action@v3
41+
uses: docker/build-push-action@v5
4242
with:
4343
context: "./Tests/"
4444
push: true

‎.github/workflows/check-gx-scs-v2.yml‎

Lines changed: 0 additions & 23 deletions
This file was deleted.

.github/workflows/check-pco-prod1-v2.yml renamed to .github/workflows/check-pco-prod1-v4.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Compliance IaaS v2 of pco-prod1"
1+
name: "Compliance IaaS v4 of pco-prod1"
22

33
on:
44
# Trigger compliance check every day at 4:30 UTC
@@ -16,7 +16,7 @@ jobs:
1616
check-pco-prod1:
1717
uses: ./.github/workflows/scs-compliance-check.yml
1818
with:
19-
version: v2
19+
version: v4
2020
layer: iaas
2121
cloud: "pco-prod1"
2222
secret_name: "OS_PASSWORD_PCOPROD1"

.github/workflows/check-regio-a-v2.yml renamed to .github/workflows/check-poc-kdo-v4.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: "Compliance IaaS v2 of regio-a"
1+
name: "Compliance IaaS v4 of poc-kdo"
22

33
on:
4-
# Trigger compliance check every day at 4:30 UTC
4+
# Trigger compliance check every day at 4:22 UTC
55
schedule:
6-
- cron: '30 4 * * *'
6+
- cron: '22 4 * * *'
77
# Trigger compliance check after Docker image has been built
88
workflow_run:
99
workflows: [Build and publish scs-compliance-check Docker image]
@@ -13,11 +13,11 @@ on:
1313
workflow_dispatch:
1414

1515
jobs:
16-
check-regio-a:
16+
check-poc-kdo:
1717
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
19-
version: v2
19+
version: v4
2020
layer: iaas
21-
cloud: "regio-a"
22-
secret_name: "OS_PASSWORD_REGIO_A"
21+
cloud: "poc-kdo"
22+
secret_name: "OS_PASSWORD_POC_KDO"
2323
secrets: inherit

‎.github/workflows/check-poc-wgcloud-v3.yml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Compliance IaaS v4 of poc-wgcloud.osba"
1+
name: "Compliance IaaS v3 of poc-wgcloud.osba"
22

33
on:
44
# Trigger compliance check every day at 4:12 UTC

.github/workflows/check-pco-prod4-v2.yml renamed to .github/workflows/check-scaleup-occ2-v4.yml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
name: "Compliance IaaS v2 of pco-prod4"
1+
name: "Compliance IaaS v4 of scaleup-occ2"
22

33
on:
44
# Trigger compliance check every day at 4:30 UTC
@@ -11,13 +11,13 @@ on:
1111
- completed
1212
# Allows you to run this workflow manually from the Actions tab
1313
workflow_dispatch:
14-
14+
1515
jobs:
16-
check-pco-prod4:
16+
check-scaleup-occ2:
1717
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
19-
version: v2
19+
version: v4
2020
layer: iaas
21-
cloud: "pco-prod4"
22-
secret_name: "OS_PASSWORD_PCOPROD4"
21+
cloud: scaleup-occ2
22+
secret_name: OS_PASSWORD_SCALEUP_OCC2
2323
secrets: inherit

.github/workflows/check-pco-prod3-v2.yml renamed to .github/workflows/check-syseleven-dus2-v3.yml

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
1-
name: "Compliance IaaS v2 of pco-prod3"
1+
name: "Compliance IaaS v3 of syseleven dus2 region"
22

33
on:
4-
# Trigger compliance check every day at 4:30 UTC
4+
# Trigger compliance check every day at 4:08 UTC
55
schedule:
6-
- cron: '30 4 * * *'
6+
- cron: '08 4 * * *'
77
# Trigger compliance check after Docker image has been built
88
workflow_run:
99
workflows: [Build and publish scs-compliance-check Docker image]
@@ -13,11 +13,11 @@ on:
1313
workflow_dispatch:
1414

1515
jobs:
16-
check-pco-prod3:
16+
check-syseleven-dus2:
1717
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
19-
version: v2
19+
version: v3
2020
layer: iaas
21-
cloud: "pco-prod3"
22-
secret_name: "OS_PASSWORD_PCOPROD3"
21+
cloud: "syseleven-dus2"
22+
secret_name: "OS_PASSWORD_SYSELEVEN_DUS2"
2323
secrets: inherit

.github/workflows/check-pco-prod2-v2.yml renamed to .github/workflows/check-syseleven-dus2-v4.yml

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
name: "Compliance IaaS v2 of pco-prod2"
1+
name: "Compliance IaaS v4 of syseleven dus2 region"
22

33
on:
4-
# Trigger compliance check every day at 4:30 UTC
4+
# Trigger compliance check every day at 4:10 UTC
55
schedule:
6-
- cron: '30 4 * * *'
6+
- cron: '10 4 * * *'
77
# Trigger compliance check after Docker image has been built
88
workflow_run:
99
workflows: [Build and publish scs-compliance-check Docker image]
1010
types:
1111
- completed
1212
# Allows you to run this workflow manually from the Actions tab
1313
workflow_dispatch:
14-
14+
1515
jobs:
16-
check-pco-prod2:
17-
uses: ./.github/workflows/scs-compliance-check.yml
16+
check-syseleven-dus2:
17+
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
19-
version: v2
19+
version: v4
2020
layer: iaas
21-
cloud: "pco-prod2"
22-
secret_name: "OS_PASSWORD_PCOPROD2"
21+
cloud: "syseleven-dus2"
22+
secret_name: "OS_PASSWORD_SYSELEVEN_DUS2"
2323
secrets: inherit

‎.github/workflows/check-syseleven-ham1-v3.yml‎

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Compliance IaaS v3 of syseleven ham1 region"
2+
3+
on:
4+
# Trigger compliance check every day at 4:09 UTC
5+
schedule:
6+
- cron: '09 4 * * *'
7+
# Trigger compliance check after Docker image has been built
8+
workflow_run:
9+
workflows: [Build and publish scs-compliance-check Docker image]
10+
types:
11+
- completed
12+
# Allows you to run this workflow manually from the Actions tab
13+
workflow_dispatch:
14+
15+
jobs:
16+
check-syseleven-ham1:
17+
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
18+
with:
19+
version: v3
20+
layer: iaas
21+
cloud: "syseleven-ham1"
22+
secret_name: "OS_PASSWORD_SYSELEVEN_HAM1"
23+
secrets: inherit

0 commit comments

Comments
 (0)