Skip to content

Commit

Permalink
Merge branch 'main' into feat/kamaji
Browse files Browse the repository at this point in the history
  • Loading branch information
mxmxchere authored Jul 3, 2024
2 parents 11930ee + 70600fb commit 4dae2ab
Show file tree
Hide file tree
Showing 169 changed files with 1,927 additions and 4,308 deletions.
10 changes: 10 additions & 0 deletions .ansible-lint
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
---
use_default_rules: true
skip_list:
- yaml # disabled because we use yamllint
# Roles and modules imported from https://opendev.org/zuul/zuul-jobs
mock_roles:
- ensure-docker
- ensure-go
mock_modules:
- zuul_return
21 changes: 21 additions & 0 deletions .github/workflows/ansible-lint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
---
name: Ansible lint

"on":
push:
branches:
- main
paths:
- 'playbooks/**'
pull_request:
paths:
- 'playbooks/**'

jobs:
build:
name: Ansible Lint
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- name: Run ansible-lint
uses: ansible/ansible-lint@v24
25 changes: 25 additions & 0 deletions .github/workflows/check-yaml-syntax.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
---
name: Check yaml syntax

"on":
push:
branches:
- main
paths:
- '**.yaml'
- '**.yml'
pull_request:
paths:
- '**.yaml'
- '**.yml'

jobs:
check-yaml-syntax:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.x'
- run: pip3 install yamllint
- run: yamllint .
19 changes: 19 additions & 0 deletions .yamllint.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,19 @@
---
extends: default

rules:
comments: enable
line-length: disable
# accept both key:
# - item
# and key:
# - item
# (the latter is very common in k8s land)
indentation:
indent-sequences: whatever
# Remove this once all yaml files become docstart header
document-start: disable
ignore:
# Help templates should and can NOT be checked with yamllint
- "**/templates/**"
- "providers/openstack/scs/1-27/cluster-addon-values.yaml"
72 changes: 72 additions & 0 deletions .zuul.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,72 @@
---
- job:
name: openstack-e2e-abstract
abstract: true
parent: openstack-access-base
description: |
An abstract job for e2e testing of cluster stacks project.
This job is not intended to be run directly, but instead
must be inherited from it.
pre-run: playbooks/dependencies.yaml
run: playbooks/openstack/e2e.yaml
cleanup-run: playbooks/openstack/cleanup.yaml # executed also when the job is canceled
vars:
wait_for_cluster_stack_resource: 120 # 2min
wait_for_clusteraddons: 120 # 2min
wait_for_cluster_stack: 1440 # 24min
wait_for_cluster: 600 # 10min
sonobouy:
enabled: false
scs_compliance:
enabled: false

- job:
name: e2e-openstack-conformance
parent: openstack-e2e-abstract
description: |
Run e2e tests of cluster-stacks project using
[sonobuoy](https://sonobuoy.io/) with mode conformance and
SCS compliance checks meaning it will test if the Kubernetes
cluster is conformant to the CNCF and to the SCS.
timeout: 10800 # 3h
vars:
wait_for_cluster: 1200 # 20min
sonobouy:
enabled: true
mode: conformance
scs_compliance:
enabled: true

- job:
name: e2e-openstack-quick
parent: openstack-e2e-abstract
description: |
Run e2e tests of cluster-stacks project using
[sonobuoy](https://sonobuoy.io/) with mode quick and
SCS compliance checks.
timeout: 7200 # 2h
vars:
wait_for_cluster: 1200 # 20min
sonobouy:
enabled: true
mode: quick
scs_compliance:
enabled: true


- project:
name: SovereignCloudStack/cluster-stacks
default-branch: main
merge-mode: "squash-merge"
e2e-test:
jobs:
- e2e-openstack-conformance
unlabel-on-update-e2e-test:
jobs:
- noop
e2e-quick-test:
jobs:
- e2e-openstack-quick
unlabel-on-update-e2e-quick-test:
jobs:
- noop
2 changes: 1 addition & 1 deletion hack/docugen.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@

BASE_PATH = Path(__file__).parent.parent
TEMPLATE_PATH = BASE_PATH.joinpath(
"providers", "openstack", "scs", "1-27", "cluster-class"
"providers", "openstack", "scs", "cluster-class"
)


Expand Down
Loading

0 comments on commit 4dae2ab

Please sign in to comment.