Skip to content

Commit 630499c

Browse files
committed
Merge branch 'improvement/add-single-node-specific-nightly' into tmp/octopus/w/125.0/improvement/add-single-node-specific-nightly
2 parents 8e18b72 + 5875e5d commit 630499c

File tree

15 files changed

+633
-478
lines changed

15 files changed

+633
-478
lines changed

.github/actions/bastion-tests/action.yaml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,10 @@ inputs:
66
description: "The pytest filter to use"
77
required: false
88
default: "post and ci and not multinode and not slow and not registry_ha"
9+
EXTRA_FILTER:
10+
description: "Extra pytest filter to add at the end"
11+
required: false
12+
default: ""
913
CONTROL_PLANE_INGRESS_VIP:
1014
description: "Virtual IP to use to test to reconfigure the Control Plane Ingress"
1115
required: false
@@ -37,4 +41,4 @@ runs:
3741
export BOOTSTRAP_BACKUP_ARCHIVE=\"${{ inputs.BOOTSTRAP_BACKUP_ARCHIVE }}\"
3842
export CONTROL_PLANE_INGRESS_VIP=\"${{ inputs.CONTROL_PLANE_INGRESS_VIP }}\"
3943
export WORKLOAD_PLANE_INGRESS_VIPS=\"${{ inputs.WORKLOAD_PLANE_INGRESS_VIPS }}\"
40-
tox -e tests -- -m \"${{ inputs.PYTEST_FILTERS }}\"
44+
tox -e tests -- -m \"${{ inputs.PYTEST_FILTERS }} ${{ inputs.EXTRA_FILTER }}\"

.github/actions/destroy-cluster/action.yaml

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ inputs:
1616
# Tooling configuration
1717
TERRAFORM_VERSION:
1818
description: "Terraform version to use"
19-
required: true
19+
required: false
20+
default: "1.3.6"
2021
TERRAFORM_SNAPSHOT_TAG:
21-
description: "Terraform snapshot tag to checkout"
22-
required: true
22+
description: "Tag to checkout for the scality/terraform-snapshot repository"
23+
required: false
24+
default: "0.9.0"
2325

2426
# Cloud configuration
2527
CLOUD:
2628
description: "Name of the remote cloud to use (available: ovh)"
27-
required: true
29+
required: false
30+
default: "ovh"
2831

2932
# Spawn configuration
3033
ARTIFACTS_URL:

.github/actions/export-cloud-env/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ inputs:
55
# The only parameter to this action
66
CLOUD:
77
description: "Short name defining the chosen remote cloud (available: ovh)"
8-
required: true
8+
required: false
9+
default: "ovh"
910

1011
# All following should map to repository secrets
1112
OVH_AUTH_URL:

.github/actions/generate-snapshots/action.yaml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ inputs:
77
required: true
88
cloud:
99
description: "Name of the remote cloud to use (available: ovh)"
10-
required: true
10+
required: false
11+
default: "ovh"
1112

1213
nodes-count:
1314
description: "The number of nodes (in addition to bootstrap) to snapshot"

.github/actions/spawn-cluster/action.yaml

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -16,15 +16,18 @@ inputs:
1616
# Tooling configuration
1717
TERRAFORM_VERSION:
1818
description: "Terraform version to use"
19-
required: true
19+
required: false
20+
default: "1.3.6"
2021
TERRAFORM_SNAPSHOT_TAG:
2122
description: "Tag to checkout for the scality/terraform-snapshot repository"
22-
required: true
23+
required: false
24+
default: "0.9.0"
2325

2426
# Cloud configuration
2527
CLOUD:
2628
description: "Name of the remote cloud to use (available: ovh)"
27-
required: true
29+
required: false
30+
default: "ovh"
2831

2932
# Spawn configuration
3033
NAME:
@@ -44,6 +47,15 @@ inputs:
4447
required: false
4548
default: ""
4649

50+
rhsm-username:
51+
description: "The RHSM username to use (only needed on RedHat)"
52+
required: false
53+
default: ""
54+
rhsm-password:
55+
description: "The RHSM password to use (only needed on RedHat)"
56+
required: false
57+
default: ""
58+
4759
runs:
4860
using: "composite"
4961
steps:
@@ -99,6 +111,8 @@ runs:
99111
TF_VAR_os: "${{ inputs.OS }}"
100112
TF_VAR_nodes_count: "${{ inputs.NODES_COUNT }}"
101113
TF_VAR_restore_env: "${{ inputs.RESTORE_ENV }}"
114+
TF_VAR_rhsm_username: "${{ inputs.rhsm-username }}"
115+
TF_VAR_rhsm_password: "${{ inputs.rhsm-password }}"
102116
MAX_RETRIES: "3"
103117
TFVARS_DIR: "${{ github.workspace }}/.github/spawn/tfvars"
104118
run: |

.github/workflows/downgrade-test.yaml

Lines changed: 1 addition & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -18,10 +18,7 @@ on:
1818
default: "unknown"
1919

2020
env:
21-
CLOUD: "ovh"
2221
OS: "rocky-8"
23-
TERRAFORM_VERSION: "1.3.6"
24-
TERRAFORM_SNAPSHOT_TAG: "0.9.0"
2522
NODES_COUNT: "0"
2623

2724
jobs:
@@ -36,10 +33,9 @@ jobs:
3633
run: sudo yum install -y isomd5sum
3734

3835
## Spawn {{{
39-
- name: Export environment variables for accessing ${{ env.CLOUD }}
36+
- name: Export environment variables for accessing the cloud
4037
uses: ./.github/actions/export-cloud-env
4138
with:
42-
CLOUD: ${{ env.CLOUD }}
4339
# Pass all "cloud access" secrets, the action will know which ones to export
4440
OVH_AUTH_URL: ${{ secrets.OVH_AUTH_URL }}
4541
OVH_USERNAME: ${{ secrets.OVH_USERNAME }}
@@ -49,12 +45,9 @@ jobs:
4945
uses: ./.github/actions/spawn-cluster
5046
with:
5147
# Parameters
52-
CLOUD: ${{ env.CLOUD }}
5348
OS: ${{ env.OS }}
5449
NAME: ${{ env.NAME }}
5550
NODES_COUNT: ${{ env.NODES_COUNT }}
56-
TERRAFORM_VERSION: ${{ env.TERRAFORM_VERSION }}
57-
TERRAFORM_SNAPSHOT_TAG: ${{ env.TERRAFORM_SNAPSHOT_TAG }}
5851
# Secrets
5952
GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}
6053
ARTIFACTS_USER: ${{ secrets.ARTIFACTS_USER }}
@@ -181,9 +174,6 @@ jobs:
181174
uses: ./.github/actions/destroy-cluster
182175
with:
183176
# Parameters
184-
CLOUD: ${{ env.CLOUD }}
185-
TERRAFORM_SNAPSHOT_TAG: ${{ env.TERRAFORM_SNAPSHOT_TAG }}
186-
TERRAFORM_VERSION: ${{ env.TERRAFORM_VERSION }}
187177
NAME: ${{ env.NAME }}
188178
# Secrets
189179
GIT_ACCESS_TOKEN: ${{ secrets.GIT_ACCESS_TOKEN }}

0 commit comments

Comments
 (0)