Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
17 changes: 17 additions & 0 deletions .github/workflows/smoke-tests.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,23 @@ jobs:
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: make smoke-legacy

smoke-cutting-edge:
runs-on: ubuntu-latest
if: |
github.event_name == 'push' ||
contains(github.event.pull_request.labels.*.name, 'smoke-test') ||
contains(github.event.pull_request.labels.*.name, 'smoke-cutting-edge')
steps:
- name: Checkout code
uses: actions/checkout@v4
- name: Setup Terraform
uses: hashicorp/setup-terraform@v3
- name: Run cutting-edge smoke test
env:
AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
run: make smoke-cutting-edge

smoke-windows:
runs-on: ubuntu-latest
if: |
Expand Down
4 changes: 4 additions & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -52,6 +52,10 @@ functional-test:
integration-test:
go test -v ./test/integration/... -timeout 20m

.PHONY: smoke-cutting-edge
smoke-cutting-edge:
go test -count=1 -v ./test/smoke/... -run TestCuttingEdgeCluster -timeout 50m

.PHONY: smoke-modern
smoke-modern:
go test -count=1 -v ./test/smoke/... -run TestModernCluster -timeout 50m
Expand Down
14 changes: 14 additions & 0 deletions test/platforms.go
Original file line number Diff line number Diff line change
Expand Up @@ -117,6 +117,20 @@ var Platforms = map[string]Platform{
Public: true,
UserData: "sudo firewall-cmd --permanent --add-port=2377/tcp --add-port=7946/tcp --add-port=7946/udp --add-port=4789/udp --add-port=10250/tcp; sudo firewall-cmd --reload",
},
"Rocky10": {
Name: "rocky_10",
Count: 1,
VolumeSize: "100",
Public: true,
UserData: "sudo firewall-cmd --permanent --add-port=2377/tcp --add-port=7946/tcp --add-port=7946/udp --add-port=4789/udp --add-port=10250/tcp; sudo firewall-cmd --reload",
},
"Rhel10": {
Name: "rhel_10",
Count: 1,
VolumeSize: "100",
Public: true,
UserData: "sudo firewall-cmd --permanent --add-port=2377/tcp --add-port=7946/tcp --add-port=7946/udp --add-port=4789/udp --add-port=10250/tcp; sudo firewall-cmd --reload",
},
"Windows2019": {
Name: "windows_2019",
Count: 1,
Expand Down
23 changes: 23 additions & 0 deletions test/smoke/smoke_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,6 +187,29 @@ func TestModernCluster(t *testing.T) {
})
}

// TestCuttingEdgeCluster exercises rhel10/rocky10/ubuntu24 managers and workers
// with sles15 as an additional worker, using the latest MCR and MKE versions.
// Requires terraform-mirantis-modules/terraform-mirantis-provision-aws PR #22 (rhel_10/rocky_10
// platform keys) to be merged and the module version bumped before this test can run.
func TestCuttingEdgeCluster(t *testing.T) {
runSmokeTest(t, smokeConfig{
Name: "cutting-edge",
MCRChannel: "stable-29.4",
MKEVersion: "3.9.2",
MSRVersion: "3.1.18",
SSHKeyAlgorithm: "ed25519",
Nodegroups: map[string]interface{}{
"MngrRhel10": test.Platforms["Rhel10"].GetManager(),
"MngrRocky10": test.Platforms["Rocky10"].GetManager(),
"MngrUbuntu24": test.Platforms["Ubuntu24"].GetManager(),
"WrkRhel10": test.Platforms["Rhel10"].GetWorker(),
"WrkRocky10": test.Platforms["Rocky10"].GetWorker(),
"WrkSles15": test.Platforms["Sles15"].GetWorker(),
"WrkUbuntu24": test.Platforms["Ubuntu24"].GetWorker(),
},
})
}

// TestLegacyCluster exercises rhel8/rocky8/ubuntu22 managers and workers
// with MCR stable-25.0 and MKE 3.8.8.
func TestLegacyCluster(t *testing.T) {
Expand Down
Loading