Skip to content

Commit

Permalink
Merge pull request #278 from flatcar-linux/tormath1/calico-arm
Browse files Browse the repository at this point in the history
Revert "kola/test/kubeadm: exclude `kubeadm.calico` from `arm64` tests"
  • Loading branch information
tormath1 authored Jan 18, 2022
2 parents 0692acf + afe4556 commit d84cdc4
Show file tree
Hide file tree
Showing 2 changed files with 1 addition and 7 deletions.
1 change: 1 addition & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
### Added
- plume: Add new AWS regions, af-south-1, ap-southeast-3, eu-south-1 ([#274](https://github.com/flatcar-linux/mantle/pull/274))
- kubernetes test for release 1.23.0 ([#275](https://github.com/flatcar-linux/mantle/pull/275))
- arm64 kubeadm test for `calico` CNI ([#278](https://github.com/flatcar-linux/mantle/pull/278))

## [0.18.0] - 12/01/2022
### Security
Expand Down
7 changes: 0 additions & 7 deletions kola/tests/kubeadm/kubeadm.go
Original file line number Diff line number Diff line change
Expand Up @@ -132,20 +132,13 @@ func init() {
testParams["CNI"] = CNI
testParams["Release"] = version

architectures := []string{"amd64"}

if CNI != "calico" {
architectures = append(architectures, "arm64")
}

register.Register(&register.Test{
Name: fmt.Sprintf("kubeadm.%s.%s.base", version, CNI),
Distros: []string{"cl"},
ExcludePlatforms: []string{"esx"},
Run: func(c cluster.TestCluster) {
kubeadmBaseTest(c, testParams)
},
Architectures: architectures,
})
}
}
Expand Down

0 comments on commit d84cdc4

Please sign in to comment.