Skip to content

Commit 5b8adff

Browse files
garloffmbuechse
andauthored
Adjust PCO SCS IaaS-compatible checks. (#867)
* Adjust PCO SCS IaaS-compatible checks. - Using AppCreds for Prod1 and Prod2 (was using usernm, passwd before) - Name Secrets OS_ACSECRET_PCOPROD[1-4] rather than OS_PASSWORD_... - Run v4 checks 5mins past v3 checks. * The v4 checks should run 5mins later. I had only changed the comment, not the setting in one case... Thanks for spotting @berendt and for the the fix @mbuechse! Signed-off-by: Kurt Garloff <[email protected]> Co-authored-by: Matthias Büchse <[email protected]>
1 parent e826e4b commit 5b8adff

File tree

9 files changed

+26
-30
lines changed

9 files changed

+26
-30
lines changed

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

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,30 +10,26 @@ clouds:
1010
interface: "public"
1111
identity_api_version: 3
1212
pco-prod1:
13+
auth_type: "v3applicationcredential"
1314
auth:
1415
auth_url: https://prod1.api.pco.get-cloud.io:5000
15-
username: "u500924-svc-standards"
16-
project_id: 204eba6723954d0d900d1144b4c9e48d
17-
project_name: "p500924-scs-healthmonitor"
18-
user_domain_name: "d500924"
16+
application_credential_id: "22801bcede0746a192abec1805c8c4e5"
1917
region_name: "prod1"
2018
interface: "public"
2119
identity_api_version: 3
2220
pco-prod2:
21+
auth_type: "v3applicationcredential"
2322
auth:
2423
auth_url: https://prod2.api.pco.get-cloud.io:5000
25-
username: "u500924-svc-standards"
26-
project_id: 6e54c8e75b744902a4c5f4389cdb0529
27-
project_name: "p500924-scs-healthmonitor"
28-
user_domain_name: "d500924"
24+
application_credential_id: "df41234ebc334d2cb99c586e8ad0056d"
2925
region_name: "prod2"
3026
interface: "public"
3127
identity_api_version: 3
3228
pco-prod3:
3329
auth_type: "v3applicationcredential"
3430
auth:
3531
auth_url: https://prod3.api.pco.get-cloud.io:5000
36-
application_credential_id: "fe66c4c8cd3b4ea08262424783e1c58f"
32+
application_credential_id: "f5864cd2b0ce4fb3ba9d7e4d5e6e0674"
3733
region_name: "prod3"
3834
interface: "public"
3935
identity_api_version: 3
@@ -42,7 +38,7 @@ clouds:
4238
auth:
4339
auth_url: https://prod4.api.pco.get-cloud.io:5000
4440
#project_id: 6a97f8c649d342429cbe5d0f943602b0
45-
application_credential_id: "11ecfb998b474b99ab044f5b20cb23d6"
41+
application_credential_id: "d265546ca8ef47e99d743c67e1230897"
4642
region_name: "prod4"
4743
interface: "public"
4844
identity_api_version: 3

.github/workflows/check-pco-prod1-v3.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ on:
1414

1515
jobs:
1616
check-pco-prod1:
17-
uses: ./.github/workflows/scs-compliance-check.yml
17+
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
1919
version: v3
2020
layer: iaas
2121
cloud: "pco-prod1"
22-
secret_name: "OS_PASSWORD_PCOPROD1"
22+
secret_name: "OS_ACSECRET_PCOPROD1"
2323
secrets: inherit
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: "Compliance IaaS v4 of pco-prod1"
22

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

1515
jobs:
1616
check-pco-prod1:
17-
uses: ./.github/workflows/scs-compliance-check.yml
17+
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
1919
version: v4
2020
layer: iaas
2121
cloud: "pco-prod1"
22-
secret_name: "OS_PASSWORD_PCOPROD1"
22+
secret_name: "OS_ACSECRET_PCOPROD1"
2323
secrets: inherit

.github/workflows/check-pco-prod2-v3.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ on:
1414

1515
jobs:
1616
check-pco-prod2:
17-
uses: ./.github/workflows/scs-compliance-check.yml
17+
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
1919
version: v3
2020
layer: iaas
2121
cloud: "pco-prod2"
22-
secret_name: "OS_PASSWORD_PCOPROD2"
22+
secret_name: "OS_ACSECRET_PCOPROD2"
2323
secrets: inherit
Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: "Compliance IaaS v4 of pco-prod2"
22

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

1515
jobs:
1616
check-pco-prod2:
17-
uses: ./.github/workflows/scs-compliance-check.yml
17+
uses: ./.github/workflows/scs-compliance-check-with-application-credential.yml
1818
with:
1919
version: v4
2020
layer: iaas
2121
cloud: "pco-prod2"
22-
secret_name: "OS_PASSWORD_PCOPROD2"
22+
secret_name: "OS_ACSECRET_PCOPROD2"
2323
secrets: inherit

.github/workflows/check-pco-prod3-v3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ jobs:
1919
version: v3
2020
layer: iaas
2121
cloud: "pco-prod3"
22-
secret_name: "OS_PASSWORD_PCOPROD3"
22+
secret_name: "OS_ACSECRET_PCOPROD3"
2323
secrets: inherit

.github/workflows/check-pco-prod3-v4.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: "Compliance IaaS v4 of pco-prod3"
22

33
on:
4-
# Trigger compliance check every day at 4:30 UTC
4+
# Trigger compliance check every day at 4:35 UTC
55
schedule:
6-
- cron: '30 4 * * *'
6+
- cron: '35 4 * * *'
77
# Trigger compliance check after Docker image has been built
88
workflow_run:
99
workflows: [Build and publish scs-compliance-check Docker image]
@@ -19,5 +19,5 @@ jobs:
1919
version: v4
2020
layer: iaas
2121
cloud: "pco-prod3"
22-
secret_name: "OS_PASSWORD_PCOPROD3"
22+
secret_name: "OS_ACSECRET_PCOPROD3"
2323
secrets: inherit

.github/workflows/check-pco-prod4-v3.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,5 +19,5 @@ jobs:
1919
version: v3
2020
layer: iaas
2121
cloud: "pco-prod4"
22-
secret_name: "OS_PASSWORD_PCOPROD4"
22+
secret_name: "OS_ACSECRET_PCOPROD4"
2323
secrets: inherit

.github/workflows/check-pco-prod4-v4.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
name: "Compliance IaaS v4 of pco-prod4"
22

33
on:
4-
# Trigger compliance check every day at 4:30 UTC
4+
# Trigger compliance check every day at 4:35 UTC
55
schedule:
6-
- cron: '30 4 * * *'
6+
- cron: '35 4 * * *'
77
# Trigger compliance check after Docker image has been built
88
workflow_run:
99
workflows: [Build and publish scs-compliance-check Docker image]
@@ -19,5 +19,5 @@ jobs:
1919
version: v4
2020
layer: iaas
2121
cloud: "pco-prod4"
22-
secret_name: "OS_PASSWORD_PCOPROD4"
22+
secret_name: "OS_ACSECRET_PCOPROD4"
2323
secrets: inherit

0 commit comments

Comments
 (0)