test: generate long node name depending on test suite

The generation of a long node name in the integration tests was
being done based on the k8s version. In the past, older K8s versions
did not support the changing name. Now it's more maintainable if
we generate the long name depending on the test suite.

Signed-off-by: Travis Nielsen <tnielsen@redhat.com>
This commit is contained in:
Travis Nielsen
2021-12-06 08:03:56 -07:00
parent ee83ca74af
commit 9d2aa1f6bd
5 changed files with 6 additions and 3 deletions
+2 -1
View File
@@ -72,6 +72,7 @@ func (h *HelmSuite) SetupSuite() {
SkipOSDCreation: false,
EnableAdmissionController: false,
EnableDiscovery: true,
ChangeHostName: true,
RookVersion: installer.LocalBuildTag,
CephVersion: installer.OctopusVersion,
}
@@ -91,7 +92,7 @@ func (h *HelmSuite) AfterTest(suiteName, testName string) {
// Test to make sure all rook components are installed and Running
func (h *HelmSuite) TestARookInstallViaHelm() {
checkIfRookClusterIsInstalled(h.Suite, h.k8shelper, h.settings.Namespace, h.settings.Namespace, 1)
checkIfRookClusterHasHealthyIngress(h.Suite, h.k8shelper, h.settings.Namespace)
checkIfRookClusterHasHealthyIngress(h.Suite, h.k8shelper, h.settings.Namespace)
}
// Test BlockCreation on Rook that was installed via Helm
+1
View File
@@ -94,6 +94,7 @@ func (s *SmokeSuite) SetupSuite() {
EnableAdmissionController: true,
UseCrashPruner: true,
EnableVolumeReplication: true,
ChangeHostName: true,
RookVersion: installer.LocalBuildTag,
CephVersion: installer.ReturnCephVersion(),
}