Skip to content

Commit 6943c59

Browse files
authored
Merge branch 'main' into feat/move-old-adr
2 parents 80a02ea + a1776e2 commit 6943c59

47 files changed

Lines changed: 819 additions & 1142 deletions

Some content is hidden

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

.zuul.d/config.yaml

Lines changed: 31 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
periodic-daily:
77
jobs:
88
- scs-check-iaas
9-
- scs-check-kaas
9+
- scs-check-kaas1
10+
- scs-check-kaas2
11+
- scs-check-kaas3
1012
periodic-hourly:
1113
jobs:
1214
- scs-check-scs2-main
@@ -16,14 +18,20 @@
1618
check:
1719
jobs:
1820
- scs-check-adr-syntax
21+
- semaphore:
22+
name: semaphore-iaas
23+
max: 1 # run at most one iaas job at the same time
24+
- semaphore:
25+
name: semaphore-kaas
26+
max: 1 # run at most one kaas job at the same time
1927
- job:
2028
name: scs-check-adr-syntax
2129
parent: base
2230
nodeset: pod-fedora-40
2331
pre-run: playbooks/pre.yaml
2432
run: playbooks/adr_syntax.yaml
2533
- job:
26-
name: scs-check-scs2
34+
name: scs-check-base
2735
parent: base
2836
secrets:
2937
- name: clouds_conf
@@ -44,6 +52,11 @@
4452
run: playbooks/compliance_check.yaml
4553
post-run:
4654
- playbooks/post_cloud.yaml
55+
- job:
56+
name: scs-check-scs2
57+
parent: scs-check-base
58+
semaphores:
59+
- semaphore-iaas
4760
- job:
4861
name: scs-check-scs2-main
4962
parent: scs-check-scs2
@@ -59,17 +72,30 @@
5972
vars:
6073
preset: iaas
6174
- job:
62-
name: scs-check-kaas
63-
parent: scs-check-scs2-main
75+
name: scs-check-kaas1
76+
parent: scs-check-base
77+
branches: main
78+
semaphores:
79+
- semaphore-kaas
6480
# timeout:
6581
# a) these tests take a lot of time, I'm afraid, particularly Sonobuoy
6682
# b) keep in mind that this job covers ALL test subjects (at most 4 in parallel)
6783
timeout: 21600 # 6 hrs -- 5 hrs was almost sufficient (reports came through sometimes)
6884
attempts: 1 # this job is heavy, and retries aren't very promising
6985
vars:
70-
preset: kaas
86+
preset: kaas1
7187
iaas: false
7288
kaas: true
7389
section: '.auto' # only do 'heavy' tests on Saturdays
7490
do_provision: true
7591
do_cleanup: false
92+
- job:
93+
name: scs-check-kaas2
94+
parent: scs-check-kaas1
95+
vars:
96+
preset: kaas2
97+
- job:
98+
name: scs-check-kaas3
99+
parent: scs-check-kaas1
100+
vars:
101+
preset: kaas3

.zuul.d/secure.yaml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -458,16 +458,16 @@
458458
/Lt6+yMJMB7AUVpwXkI7cMmf+QXbDnnE6eX0UBosTM6MjdA/zhkjJ6PK9E0FnngW4HRDZ
459459
eAiVSQiN4CSa9bylrwLhvarAEhR+5avRv4yTurgAYe6I6Gh05pBPCgTXmCNxPU=
460460
scaleup_api_server: !encrypted/pkcs1-oaep
461-
- H4F/zi6Lp/CbkHPG4tEzhFVRprH6uxVqoOirUZNKOg1pDI33ilXG4K99O/CH9dCqbFiV0
462-
GnI4p8b0Csho6S63DEuMikjXBLfNWsd2BncQ4gu4bGhHef3bkCjEmybk3AmEyA789vRNS
463-
o6xjZUAJB0ZEQeuWudSo28fJDGxGOVcVW0Sda+OSk0K3qftucg047KZdJ5bWZmHTPvOha
464-
4R2+nsbnecAQJtMDWVERPYTD62pF4CAHD6XVf9mUuZNnLYibl5uQz0t6JZQANu83pFYDZ
465-
C5Z7T4/UJxKlyBpL2XtF/cHuKavEP41cheD/ihG1EI9Yf3InFCRllbIGzMj8fq8d4bZKV
466-
tC1iui2RrL3s38GrOyyGE7odyHlvl08zbrJTkWb5UcI20jPxBCxHAvlqIWjl+9Ite7OuM
467-
nXq62IgXUqVWWgrGWRINyJlvRgcQPxCVq7ty3OMB1Vp4R0ldDRWWR9+PozmK86fRXYatE
468-
cgRi579JMBvKjbP9hKcZOkb12PVyZTTOLmyepfMAqZVpBULtpNza26ysCl5Wu14+0o3bh
469-
d6Kst5qeZz4P8QjJe2UQU67B8JcX88zbpNYM1uxLhtXlAk0/8Hd8KWm+KiU/NfNzgr7jd
470-
jxRhMEdHUuMOKHaSR/hwJs7kWp1RVR6l7L+SXv02VrYgzysGCiGqXhV9FwrEQw=
461+
- VCeER+5TfxyzOnvIWrAx30FRdwa4I837hPnELGWWmmzdyPQCKVqP4dKEX09nmzwabLnWF
462+
WEzMhG9tHsIPBImP2x6VMAqwGsocAdS+Xw73gJXJm0P79gc2xqbnL8BpirraAH+TpCG+G
463+
eYcQKzfKfhIViVix7WJfeqodN6sB3oaAodlcvjMpqeYL+USQsZj+ejZZc61P0ec8AybXd
464+
lCxuRrdutks6aJlnIaQ9o1G+40DUzljd6RrrGQDPfQOx8XZCaN+eskpox/iKVX6Fso23U
465+
Zv8ZCQg2FsT9M9s2GC/KcLgQcHVIkKTYpr6Fnx4ymoxfCE4D2l2B6hK6PcT8I4OAMDZKn
466+
MtV8wSsSbnohUpCGN8qMyjTf5q2WHr55BWaYmvRVkAwm+eAEd2/EBr6FSXss9C0hKNznr
467+
w60LZhXC5QCXvc3tS+A+8s913luzQI8zmlQCSHHqIJujtLNhP/BO/7EpR9GMHD9KZxP17
468+
IqElVTiWYJX2tzx309+G4zhw5L8qwG9FvaDVr9DBdv1mgrKl7QTi5SbfQMn4DExCCaJmR
469+
kglEjdtYoHoulJP0KD9a1Sfrg0sQDPBag44cjORfN8mvzPcI2QLAz+iClZhi2pHVnwEZH
470+
k49ZE1+gp/PUdlFPDdhHVAJgB4tzZEXPOrbgUGCIqqNam9IwzOrRuFR8fIvXVo=
471471
scaleup_ca_data: !encrypted/pkcs1-oaep
472472
- CDar1TQ3Q4HrBXIDwVFvzL0FgPFy7r3K4joQmKnIbCJZ9pmbtrGGSD7xOsJnfIm5e89ZK
473473
g4D654VfvK4+upredcVP5MRkfXY/SKfh9glR9okQMpsRS0T5l3kS+RpZOLPCuvvit3i1h

CODEOWNERS

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,9 +3,3 @@
33
/compliance-monitor/ @mbuechse @depressiveRobot
44

55
/Tests/ @mbuechse @depressiveRobot
6-
7-
# Members of the Project Board are the owners of the Community
8-
# Governance - see:
9-
# https://docs.scs.community/community/governance/project-board
10-
/Community-Governance/ @SovereignCloudStack/project-board
11-

Community-Governance/2024-12-project-board-nominees.md

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

Community-Governance/2025-01-project-board.md

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

Community-Governance/2025-12-project-board-nominees.md

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

Community-Governance/2026-01-project-board.md

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

Standards/scs-0004-v1-achieving-certification.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ As operator, I want to obtain a certificate with the scope SCS-compatible IaaS o
2020

2121
0. Certificates are issued by the SCS certification assessment body. This is either the _Forum SCS-Standards_, part of the Open Source Business Alliance e.V. (OSBA), or an organization appointed by the _Forum SCS-Standards_ . An interested party has to apply for certification with this body, which in turn determines the rules that govern what parties are eligible for application (fees may apply).
2222

23-
1. Each certificate issued pertains to a given combination of subject (specific cloud environment including IaaS regions or KaaS configurations), scope (such as _SCS-compatible IaaS_ or _SCS-compatible KaaS_), and version of that scope. The certificate is only valid for that combination and for the time frame that ends when the scope expires, or for six months if the expiration date for the scope is not yet fixed.
23+
1. Each certificate issued pertains to a given combination of subject (specific cloud environment including IaaS regions or KaaS configurations), scope (such as _SCS-compatible IaaS_ or _SCS-compatible KaaS_), and version of that scope. The certificate is only valid for that combination for the period of one year (regardless of the expiration date of the scope version).
2424

2525
2. The operator MUST ensure that the official [SCS compliance test suite](https://github.com/SovereignCloudStack/standards/tree/main/Tests) (which does not require admin privileges) is run at regular intervals and that all tests pass. The operator MUST submit the resulting reports to the [SCS compliance monitor](https://github.com/SovereignCloudStack/standards/tree/main/compliance-monitor).
2626

Standards/scs-0005-v2-project-governance.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ three weeks in advance of happening and run for a week.
119119

120120
Every person who is part of the Sovereign Cloud Stack GitHub organization can be
121121
nominated for the board. Likewise, one can nominate oneself.
122-
The nomination is done by adding the person with the required data to the file corresponding to the term in the "Community-Governance" folder in the [Standards](https://github.com/sovereignCloudStack/standards/) repository. Obviously, the person, that is to be nominated, should be asked before being added to the file.
122+
The nomination is done by adding the person with the required data to the file corresponding to the term in the [docs](https://github.com/SovereignCloudStack/docs/tree/main/community/governance) repository. Obviously, the person in question should be asked before being added to the file.
123123

124124
### Eligible for voting
125125

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
1-
# Procuring Open Source Projects
2-
3-
OSS project health check
1+
---
2+
title: Open Source Software Health Check
3+
type: Decision Record
4+
status: Draft
5+
track: Global
6+
---
47

58
## Four Opens
69

0 commit comments

Comments
 (0)