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

Diff for: ‎.github/scs-compliance-check/openstack/clouds.yaml

+35-4
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

Diff for: ‎.github/workflows/build-docker.yml

+4-4
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

Diff for: ‎.github/workflows/check-gx-scs-v2.yml

-23
This file was deleted.

Diff for: ‎.github/workflows/check-pco-prod1-v2.yml renamed to ‎.github/workflows/check-pco-prod1-v4.yml

+2-2
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"

Diff for: ‎.github/workflows/check-regio-a-v2.yml renamed to ‎.github/workflows/check-poc-kdo-v4.yml

+7-7
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

Diff for: ‎.github/workflows/check-poc-wgcloud-v3.yml

+1-1
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

Diff for: ‎.github/workflows/check-pco-prod4-v2.yml renamed to ‎.github/workflows/check-scaleup-occ2-v4.yml

+6-6
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

Diff for: ‎.github/workflows/check-pco-prod3-v2.yml renamed to ‎.github/workflows/check-syseleven-dus2-v3.yml

+7-7
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

Diff for: ‎.github/workflows/check-pco-prod2-v2.yml renamed to ‎.github/workflows/check-syseleven-dus2-v4.yml

+9-9
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

Diff for: ‎.github/workflows/check-syseleven-ham1-v3.yml

+23
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

Diff for: ‎.github/workflows/check-syseleven-ham1-v4.yml

+23
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
name: "Compliance IaaS v4 of syseleven ham1 region"
2+
3+
on:
4+
# Trigger compliance check every day at 4:15 UTC
5+
schedule:
6+
- cron: '15 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: v4
20+
layer: iaas
21+
cloud: "syseleven-ham1"
22+
secret_name: "OS_PASSWORD_SYSELEVEN_HAM1"
23+
secrets: inherit

Diff for: ‎.github/workflows/check-wavestack-v2.yml

-23
This file was deleted.

Diff for: ‎.github/workflows/create-flavors-spec.yml

+1-1
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ jobs:
1313
default:
1414
runs-on: ubuntu-latest
1515
steps:
16-
- uses: actions/checkout@v3
16+
- uses: actions/checkout@v4
1717
with:
1818
token: ${{ secrets.FLAVORS_SPEC_PAT }}
1919
- name: Set up Python 3.10.5

Diff for: ‎.github/workflows/link-validator.yml

+6-5
Original file line numberDiff line numberDiff line change
@@ -1,25 +1,26 @@
1-
name: Check links for modified files
1+
name: Check links in Markdown files
22

3-
on:
3+
"on":
44
workflow_dispatch:
55
schedule:
66
- cron: "0 0 * * *"
77
push:
88
branches:
99
- main
10-
pull_request: # Add this section
10+
pull_request:
1111
branches:
1212
- main
1313

1414
jobs:
1515
markdown-link-check:
1616
runs-on: ubuntu-latest
1717
steps:
18-
- uses: actions/checkout@v3
18+
- uses: actions/checkout@v4
1919
- uses: gaurav-nelson/[email protected]
2020
with:
2121
use-quiet-mode: 'yes'
2222
use-verbose-mode: 'yes'
23-
check-modified-files-only: 'yes'
23+
# https://github.com/orgs/community/discussions/26738#discussioncomment-3253176
24+
check-modified-files-only: ${{ contains(fromJSON('["push", "pull_request"]'), github.event_name) && 'yes' || 'no' }}
2425
config-file: 'mlc_config.json'
2526
base-branch: 'main'

Diff for: ‎.github/workflows/lint-golang.yml

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
name: Check Go syntax
2+
3+
on:
4+
push:
5+
paths:
6+
- 'Tests/kaas/kaas-sonobuoy-tests/**/*.go'
7+
- .github/workflows/lint-go.yml
8+
9+
jobs:
10+
lint-go-syntax:
11+
runs-on: ubuntu-latest
12+
steps:
13+
- uses: actions/checkout@v4
14+
15+
- name: Set up Go
16+
uses: actions/setup-go@v4
17+
with:
18+
go-version: '1.23'
19+
20+
# Install golangci-lint
21+
- name: Install golangci-lint
22+
run: |
23+
curl -sSfL https://raw.githubusercontent.com/golangci/golangci-lint/master/install.sh | sh -s -- -b $(go env GOPATH)/bin v1.61.0
24+
25+
# Run golangci-lint
26+
- name: Run golangci-lint
27+
working-directory: Tests/kaas/kaas-sonobuoy-tests
28+
run: golangci-lint run ./... -v

Diff for: ‎.github/workflows/scs-compliance-check-with-application-credential.yml

+4-1
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,13 @@ jobs:
3232
auth:
3333
application_credential_secret: ${{ secrets[inputs.secret_name] }}
3434
EOF
35+
- name: "Clean up any lingering resources from previous run"
36+
if: ${{ inputs.layer == 'iaas' && inputs.version == 'v4' }}
37+
run: "cd /scs-compliance && ./cleanup.py -c ${{ inputs.cloud }} --prefix _scs- --ipaddr 10.1.0. --debug"
3538
- name: "Run scs-compliance-check"
3639
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 }}"
3740
- name: "Upload results"
38-
uses: actions/upload-artifact@v3
41+
uses: actions/upload-artifact@v4
3942
with:
4043
name: result
4144
path: /scs-compliance/result.yaml

0 commit comments

Comments
 (0)