Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix the scheduled actions to take correct input and fix invalid aksClusterConfig key #37

Merged
merged 3 commits into from
Jan 17, 2024
Merged

Fix the scheduled actions to take correct input and fix invalid aksClusterConfig key #37

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
fdd4709
Fix GH action input issue for scheduled workflows
valaparthvi Jan 16, 2024
ff3c5a8
Fix invalid key
valaparthvi Jan 17, 2024
7f87edb
Fix nigtly operator charts issue
valaparthvi Jan 17, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 10 additions & 10 deletions .github/workflows/aks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
description: k3s version of local cluster
required: true
type: string
default: v1.26.10+k3s1
default: v1.27.9+k3s1
operator_nightly_chart:
description: Install hosted-provider nightly chart
default: true
Expand Down Expand Up @@ -52,12 +52,12 @@ jobs:
secrets: inherit
with:
hosted_provider: aks
rancher_version: ${{ inputs.rancher_version }}
k3s_version: ${{ inputs.k3s_version }}
operator_nightly_chart: ${{ inputs.operator_nightly_chart == true }}
run_p0_provisioning_tests: ${{ inputs.run_p0_provisioning_tests == true }}
run_p0_importing_tests: ${{ inputs.run_p0_imorting_tests == true }}
run_support_matrix_provisioning_tests: ${{ inputs.run_support_matrix_provisioning_tests == true }}
run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true }}
destroy_runner: ${{ inputs.destroy_runner == true }}
runner_template: ${{ inputs.runner_template }}
rancher_version: ${{ inputs.rancher_version || '2.8-head' }}
k3s_version: ${{ inputs.k3s_version || 'v1.27.9+k3s1' }}
operator_nightly_chart: ${{ inputs.operator_nightly_chart == true || true }}
run_p0_provisioning_tests: ${{ inputs.run_p0_provisioning_tests == true || github.event_name == 'schedule' && true }}
run_p0_importing_tests: ${{ inputs.run_p0_imorting_tests == true || github.event_name == 'schedule' && true }}
run_support_matrix_provisioning_tests: ${{ inputs.run_support_matrix_provisioning_tests == true || github.event_name == 'schedule' && false }}
run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true || github.event_name == 'schedule' && false }}
destroy_runner: ${{ inputs.destroy_runner == true || github.event_name == 'schedule' && true }}
runner_template: ${{ inputs.runner_template || 'hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1' }}
20 changes: 10 additions & 10 deletions .github/workflows/eks.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
description: k3s version of local cluster
required: true
type: string
default: v1.26.10+k3s1
default: v1.27.9+k3s1
operator_nightly_chart:
description: Install hosted-provider nightly chart
default: true
Expand Down Expand Up @@ -52,12 +52,12 @@ jobs:
secrets: inherit
with:
hosted_provider: eks
rancher_version: ${{ inputs.rancher_version }}
k3s_version: ${{ inputs.k3s_version }}
operator_nightly_chart: ${{ inputs.operator_nightly_chart == true }}
run_p0_provisioning_tests: ${{ inputs.run_p0_provisioning_tests == true }}
run_p0_importing_tests: ${{ inputs.run_p0_imorting_tests == true }}
run_support_matrix_provisioning_tests: ${{ inputs.run_support_matrix_provisioning_tests == true }}
run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true }}
destroy_runner: ${{ inputs.destroy_runner == true }}
runner_template: ${{ inputs.runner_template }}
rancher_version: ${{ inputs.rancher_version || '2.8-head' }}
k3s_version: ${{ inputs.k3s_version || 'v1.27.9+k3s1' }}
operator_nightly_chart: ${{ inputs.operator_nightly_chart == true || true }}
run_p0_provisioning_tests: ${{ inputs.run_p0_provisioning_tests == true || github.event_name == 'schedule' && true }}
run_p0_importing_tests: ${{ inputs.run_p0_imorting_tests == true || github.event_name == 'schedule' && true }}
run_support_matrix_provisioning_tests: ${{ inputs.run_support_matrix_provisioning_tests == true || github.event_name == 'schedule' && false }}
run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true || github.event_name == 'schedule' && false }}
destroy_runner: ${{ inputs.destroy_runner == true || github.event_name == 'schedule' && true }}
runner_template: ${{ inputs.runner_template || 'hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1' }}
20 changes: 10 additions & 10 deletions .github/workflows/gke.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ on:
description: k3s version of local cluster
required: true
type: string
default: v1.26.10+k3s1
default: v1.27.9+k3s1
operator_nightly_chart:
description: Install hosted-provider nightly chart
# Until https://github.com/rancher/gke-operator/issues/137 is fixed
Expand Down Expand Up @@ -53,12 +53,12 @@ jobs:
secrets: inherit
with:
hosted_provider: gke
rancher_version: ${{ inputs.rancher_version }}
k3s_version: ${{ inputs.k3s_version }}
operator_nightly_chart: ${{ inputs.operator_nightly_chart == false }}
run_p0_provisioning_tests: ${{ inputs.run_p0_provisioning_tests == true }}
run_p0_importing_tests: ${{ inputs.run_p0_imorting_tests == true }}
run_support_matrix_provisioning_tests: ${{ inputs.run_support_matrix_provisioning_tests == true }}
run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true }}
destroy_runner: ${{ inputs.destroy_runner == true }}
runner_template: ${{ inputs.runner_template }}
rancher_version: ${{ inputs.rancher_version || '2.8-head' }}
k3s_version: ${{ inputs.k3s_version || 'v1.27.9+k3s1' }}
operator_nightly_chart: ${{ inputs.operator_nightly_chart == false || false }}
Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

For some reason, if I use github.event == 'schedule' && false or github.event == 'schedule' && true, it always takes the value as true, so I have decided to use pass false, and same for other providers.

run_p0_provisioning_tests: ${{ inputs.run_p0_provisioning_tests == true || github.event_name == 'schedule' && true }}
run_p0_importing_tests: ${{ inputs.run_p0_imorting_tests == true || github.event_name == 'schedule' && true }}
run_support_matrix_provisioning_tests: ${{ inputs.run_support_matrix_provisioning_tests == true || github.event_name == 'schedule' && false }}
run_support_matrix_importing_tests: ${{ inputs.run_support_matrix_importing_tests == true || github.event_name == 'schedule' && false }}
destroy_runner: ${{ inputs.destroy_runner == true || github.event_name == 'schedule' && true }}
runner_template: ${{ inputs.runner_template || 'hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1'}}
2 changes: 1 addition & 1 deletion .github/workflows/main.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ on:
type: boolean
runner_template:
description: Runner template to use
default: hosted-prov-e2e-ci-runner-spot-n2-highmem-16-gl-template-v1
required: true
type: string

env:
Expand Down
2 changes: 1 addition & 1 deletion hosted/helpers/helper_common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@ func CommonBeforeSuite(cloud string) (Context, error) {
azureClusterConfig := new(management.AKSClusterConfigSpec)
// provisioning test cases rely on config file to fetch the location information
// this is necessary so that there is a single source of truth for provisioning and import test cases
config.LoadAndUpdateConfig("azureClusterConfig", azureClusterConfig, func() {
config.LoadAndUpdateConfig("aksClusterConfig", azureClusterConfig, func() {
azureClusterConfig.ResourceLocation = GetAKSLocation()
})
case "eks":
Expand Down