Skip to content

Commit

Permalink
Add SkipUpgradeTestsLog & logging for AfterEach
Browse files Browse the repository at this point in the history 
Signed-off-by: Chandan Pinjani <chandan.pinjani@suse.com>
  • Loading branch information
@cpinjani
cpinjani committed Feb 5, 2025
1 parent f2af1f4 commit 2ac2cf1
Show file tree
Hide file tree
Showing 21 changed files with 84 additions and 58 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/main.yaml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -441,6 +441,7 @@ jobs:
if-no-files-found: ignore

- name: Add summary
shell: bash
if: ${{ always() && steps.prepare-rancher.outcome == 'success' }}
run: |
# Add summary
Expand All @@ -450,7 +451,7 @@ jobs:
echo "Tests run: ${{ inputs.tests_to_run }}" >> ${GITHUB_STEP_SUMMARY}
OPERATOR_HELM_VERSION=$(helm get metadata rancher-${{ inputs.hosted_provider }}-operator -n cattle-system -o json | jq -r .version)
echo "Installed rancher-${{ inputs.hosted_provider }}-operator chart version: $OPERATOR_HELM_VERSION" >> ${GITHUB_STEP_SUMMARY}
if [ ${{ inputs.tests_to_run }} =~ "backup_restore" ]; then
if [[ ${{ inputs.tests_to_run }} =~ "backup_restore" ]]; then
BR_OPERATOR_HELM_VERSION=$(helm get metadata rancher-backup -n cattle-resources-system -o json | jq -r .version)
echo "Installed backup-restore operator chart version: $BR_OPERATOR_HELM_VERSION" >> ${GITHUB_STEP_SUMMARY}
fi
Expand Down
11 changes: 7 additions & 4 deletions hosted/aks/p0/p0_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -66,10 +66,13 @@ var _ = Describe("P0Import", func() {
})

AfterEach(func() {
if ctx.ClusterCleanup && cluster != nil {
err := helper.DeleteAKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
err = helper.DeleteAKSClusteronAzure(clusterName)
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteAKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
err := helper.DeleteAKSClusteronAzure(clusterName)
Expect(err).To(BeNil())
} else {
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
Expand Down
9 changes: 6 additions & 3 deletions hosted/aks/p0/p0_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -63,9 +63,12 @@ var _ = Describe("P0Provisioning", func() {
Expect(err).To(BeNil())
})
AfterEach(func() {
if ctx.ClusterCleanup && cluster != nil {
err := helper.DeleteAKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteAKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
} else {
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
}
Expand Down
10 changes: 5 additions & 5 deletions hosted/aks/p1/p1_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ var _ = Describe("P1Import", func() {

It("should be able to update cluster monitoring", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
testCaseID = 271
updateMonitoringCheck(cluster, ctx.RancherAdminClient)
Expand Down Expand Up @@ -108,7 +108,7 @@ var _ = Describe("P1Import", func() {

It("should successfully Import a cluster in Region without AZ", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
location = "ukwest"
testCaseID = 276
Expand Down Expand Up @@ -145,7 +145,7 @@ var _ = Describe("P1Import", func() {
var upgradeToVersion string
BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

kubeletConfigJsonData := `{"cpuManagerPolicy": "static", "cpuCfsQuota": true, "cpuCfsQuotaPeriod": "200ms", "imageGcHighThreshold": 90, "imageGcLowThreshold": 70, "topologyManagerPolicy": "best-effort", "allowedUnsafeSysctls": ["kernel.msg*","net.*"], "failSwapOn": false}`
Expand Down Expand Up @@ -236,7 +236,7 @@ var _ = Describe("P1Import", func() {
var upgradeK8sVersion string
BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

var err error
Expand All @@ -258,7 +258,7 @@ var _ = Describe("P1Import", func() {

It("NP cannot be upgraded to k8s version greater than CP k8s version", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
testCaseID = 269
npUpgradeToVersionGTCPCheck(cluster, ctx.RancherAdminClient, upgradeK8sVersion)
Expand Down
10 changes: 5 additions & 5 deletions hosted/aks/p1/p1_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ var _ = Describe("P1Provisioning", func() {

It("should successfully Create a cluster in Region without AZ", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
location = "ukwest"
testCaseID = 275
Expand Down Expand Up @@ -437,7 +437,7 @@ var _ = Describe("P1Provisioning", func() {

It("should be able to update cluster monitoring", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
testCaseID = 200
updateMonitoringCheck(cluster, ctx.RancherAdminClient)
Expand Down Expand Up @@ -520,7 +520,7 @@ var _ = Describe("P1Provisioning", func() {
var upgradeK8sVersion string
BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

var err error
Expand All @@ -539,7 +539,7 @@ var _ = Describe("P1Provisioning", func() {

It("NP cannot be upgraded to k8s version greater than CP k8s version", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
testCaseID = 183
npUpgradeToVersionGTCPCheck(cluster, ctx.RancherAdminClient, upgradeK8sVersion)
Expand Down Expand Up @@ -596,7 +596,7 @@ var _ = Describe("P1Provisioning", func() {

It("should not be able to select NP K8s version; CP K8s version should take precedence", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

testCaseID = 182
Expand Down
2 changes: 1 addition & 1 deletion hosted/aks/p1/sync_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,7 +56,7 @@ var _ = Describe("SyncImport", func() {

BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
var err error
k8sVersion, err = helper.GetK8sVersion(ctx.RancherAdminClient, ctx.CloudCredID, location, true)
Expand Down
2 changes: 1 addition & 1 deletion hosted/aks/p1/sync_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ var _ = Describe("SyncProvisioning", func() {

BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

var err error
Expand Down
13 changes: 8 additions & 5 deletions hosted/eks/p0/p0_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var _ = Describe("P0Import", func() {
When("a cluster is created", func() {
BeforeEach(func() {
if testData.isUpgrade && helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

k8sVersion, err := helper.GetK8sVersion(ctx.RancherAdminClient, testData.isUpgrade)
Expand All @@ -66,10 +66,13 @@ var _ = Describe("P0Import", func() {
Expect(err).To(BeNil())
})
AfterEach(func() {
if ctx.ClusterCleanup && cluster != nil {
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
err = helper.DeleteEKSClusterOnAWS(region, clusterName)
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
err := helper.DeleteEKSClusterOnAWS(region, clusterName)
Expect(err).To(BeNil())
} else {
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
Expand Down
11 changes: 7 additions & 4 deletions hosted/eks/p0/p0_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var _ = Describe("P0Provisioning", func() {
When("a cluster is created", func() {
BeforeEach(func() {
if testData.isUpgrade && helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

k8sVersion, err := helper.GetK8sVersion(ctx.RancherAdminClient, testData.isUpgrade)
Expand All @@ -63,9 +63,12 @@ var _ = Describe("P0Provisioning", func() {
Expect(err).To(BeNil())
})
AfterEach(func() {
if ctx.ClusterCleanup && cluster != nil {
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
} else {
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
}
Expand Down
15 changes: 9 additions & 6 deletions hosted/eks/p1/p1_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,16 @@ var _ = Describe("P1Import", func() {
})

AfterEach(func() {
if ctx.ClusterCleanup && (cluster != nil && cluster.ID != "") {
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
err = helper.DeleteEKSClusterOnAWS(region, clusterName)
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
err := helper.DeleteEKSClusterOnAWS(region, clusterName)
Expect(err).To(BeNil())
} else {
GinkgoLogr.Info(fmt.Sprintf("Skipping downstream cluster deletion: %s", clusterName))
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
}
})

Expand All @@ -36,7 +39,7 @@ var _ = Describe("P1Import", func() {

BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

var err error
Expand Down
13 changes: 8 additions & 5 deletions hosted/eks/p1/p1_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -28,11 +28,14 @@ var _ = Describe("P1Provisioning", func() {
})

AfterEach(func() {
if ctx.ClusterCleanup && (cluster != nil && cluster.ID != "") {
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteEKSHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
} else {
GinkgoLogr.Info(fmt.Sprintf("Skipping downstream cluster deletion: %s", clusterName))
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
}
})

Expand Down Expand Up @@ -208,7 +211,7 @@ var _ = Describe("P1Provisioning", func() {

BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

var err error
Expand Down
2 changes: 1 addition & 1 deletion hosted/eks/p1/sync_importing_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ var _ = Describe("SyncImport", func() {
var upgradeToVersion string
BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
var err error
k8sVersion, err = helper.GetK8sVersion(ctx.RancherAdminClient, true)
Expand Down
2 changes: 1 addition & 1 deletion hosted/eks/p1/sync_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ var _ = Describe("SyncProvisioning", func() {

BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
var err error
k8sVersion, err = helper.GetK8sVersion(ctx.RancherAdminClient, true)
Expand Down
13 changes: 8 additions & 5 deletions hosted/gke/p0/p0_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ var _ = Describe("P0Import", func() {
When("a cluster is import", func() {
BeforeEach(func() {
if testData.isUpgrade && helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
k8sVersion, err := helper.GetK8sVersion(ctx.RancherAdminClient, project, ctx.CloudCredID, zone, "", testData.isUpgrade)
Expect(err).NotTo(HaveOccurred())
Expand All @@ -66,10 +66,13 @@ var _ = Describe("P0Import", func() {
Expect(err).To(BeNil())
})
AfterEach(func() {
if ctx.ClusterCleanup && cluster != nil {
err := helper.DeleteGKEHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
err = helper.DeleteGKEClusterOnGCloud(zone, project, clusterName)
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteGKEHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
err := helper.DeleteGKEClusterOnGCloud(zone, project, clusterName)
Expect(err).To(BeNil())
} else {
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
Expand Down
11 changes: 7 additions & 4 deletions hosted/gke/p0/p0_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@ var _ = Describe("P0Provisioning", func() {
When("a cluster is created", func() {
BeforeEach(func() {
if testData.isUpgrade && helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

if strings.Contains(testData.testTitle, "regional") {
Expand All @@ -87,9 +87,12 @@ var _ = Describe("P0Provisioning", func() {
Expect(err).To(BeNil())
})
AfterEach(func() {
if ctx.ClusterCleanup && cluster != nil {
err := helper.DeleteGKEHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
if ctx.ClusterCleanup {
if cluster != nil && cluster.ID != "" {
GinkgoLogr.Info(fmt.Sprintf("Cleaning up resource cluster: %s %s", cluster.Name, cluster.ID))
err := helper.DeleteGKEHostCluster(cluster, ctx.RancherAdminClient)
Expect(err).To(BeNil())
}
} else {
fmt.Println("Skipping downstream cluster deletion: ", clusterName)
}
Expand Down
2 changes: 1 addition & 1 deletion hosted/gke/p1/p1_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,7 +174,7 @@ var _ = Describe("P1Import", func() {

BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

var err error
Expand Down
6 changes: 3 additions & 3 deletions hosted/gke/p1/p1_provisioning_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -129,7 +129,7 @@ var _ = Describe("P1Provisioning", func() {

It("should be able to create a cluster with CP K8s version v-XX-1 and NP K8s version v-XX should use v-XX-1 for both CP and NP", func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
testCaseID = 33

Expand Down Expand Up @@ -234,7 +234,7 @@ var _ = Describe("P1Provisioning", func() {
testCaseID = 30
var err error
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

_, err = helper.AddNodePool(cluster, ctx.RancherAdminClient, 1, "WINDOWS_LTSC_CONTAINERD", true, true)
Expand Down Expand Up @@ -316,7 +316,7 @@ var _ = Describe("P1Provisioning", func() {

BeforeEach(func() {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}

var err error
Expand Down
2 changes: 1 addition & 1 deletion hosted/gke/p1/p1_suite_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -247,7 +247,7 @@ func syncNodepoolsCheck(cluster *management.Cluster, client *rancher.Client) {
// updateClusterInUpdatingState runs checks to ensure cluster in an updating state can be updated
func updateClusterInUpdatingState(cluster *management.Cluster, client *rancher.Client) {
if helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
availableVersions, err := helper.ListGKEAvailableVersions(client, cluster.ID)
Expect(err).To(BeNil())
Expand Down
2 changes: 1 addition & 1 deletion hosted/gke/p1/sync_import_test.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ var _ = Describe("SyncImport", func() {

BeforeEach(func() {
if testData.isUpgrade && helpers.SkipUpgradeTests {
Skip("Skipping test for v2.8 ...")
Skip(helpers.SkipUpgradeTestsLog)
}
k8sVersion, err := helper.GetK8sVersion(ctx.RancherAdminClient, project, ctx.CloudCredID, zone, "", testData.isUpgrade)
Expect(err).NotTo(HaveOccurred())
Expand Down
Loading

0 comments on commit 2ac2cf1

Please sign in to comment.