upgraded ginkgo on tests to ginkgo 2.0 #560

mperetzred · 2022-01-30T07:54:06Z

Upgraded ginkgo to version 2.0, so it will be possible to use labels in order to filter tests in CI, instead of using conditions within the test logic.
Left ginkgo 1.16 because it's used in controllers/suite_test.go, and it uses timeout as part of BeforeSuite function, which is probably deprecated in ginkgo 2..

openshift-ci · 2022-01-30T07:54:39Z

Hi @mperetzred. Thanks for your PR.

I'm waiting for a openshift member to verify that this patch is reasonable to test. If it is, they should reply with /ok-to-test on its own line. Until that is done, I will not automatically test new commits in this PR, but the usual testing commands by org members will still work. Regular contributors should join the org to skip this step.

Once the patch is verified, the new status will be reflected by the ok-to-test label.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

kaovilai · 2022-01-31T13:05:43Z

/ok-to-test

weshayutin · 2022-01-31T20:11:23Z

Please make sure this passes 4.7/4.8 e2e more than just once before merge :) PRETTY PLEASE :)

nitishSr · 2022-02-01T06:44:38Z

tests/e2e/backup_restore_suite_test.go

-					log.Printf("Creating VolumeSnapshot for CSI backuprestore of %s", brCase.Name)
-					err = installApplication(dpaCR.Client, "./sample-applications/gp2-csi/volumeSnapshotClass.yaml")
-					Expect(err).ToNot(HaveOccurred())
-				} else {


@mperetzred could you please explain, reason for removing this else?

no need for it, using aws label instead, and it will be filtered if cluster profile is not aws (check the filters on the makefile)

nitishSr · 2022-02-01T06:45:45Z

tests/e2e/backup_restore_suite_test.go

@@ -170,7 +165,7 @@ var _ = Describe("AWS backup restore tests", func() {
 			}

 		},
-		Entry("MSSQL application CSI", BackupRestoreCase{
+		Entry("MSSQL application CSI", Label("aws"), BackupRestoreCase{


why this label has been applied only to first Entry?

instead of having a condition inside the test logic:

if brCase.BackupRestoreType == csi { if clusterProfile == "aws" { log.Printf("Creating VolumeSnapshot for CSI backuprestore of %s", brCase.Name) err = installApplication(dpaCR.Client, "./sample-applications/gp2-csi/volumeSnapshotClass.yaml") Expect(err).ToNot(HaveOccurred()) } else {

mperetzred · 2022-02-01T07:35:20Z

@weshayutin, it seems like it fails due to the same problem you have on CI. The mssql deployment doesn't get ready.
But will do a retest until it will pass.

mperetzred · 2022-02-01T07:37:21Z

/retest-required

mperetzred · 2022-02-01T07:46:27Z

sorry, accidentally closed it.

mperetzred · 2022-02-01T07:46:47Z

/retest

mperetzred · 2022-02-01T12:03:00Z

@weshayutin, all checks have passed, want me to do a /retest again?

weshayutin · 2022-02-01T20:42:02Z

@mperetzred the instability of the jobs is not your fault, nor am I saying it's this particular patch. With that said, we're working to improve that.

http://oadp-ci.usersys.redhat.com:8080/d/2ApQc7Jnz/oadp-pull-test?orgId=1&var-influxdb_filter=pull_request%7C%3D~%7C%2F.*560.*%2F

The e2e on this pr
4.7 pass: 2 failed: 2
4.8 pass: 1 failed: 3

4.8 atm has a 90% pass rate in periodic
http://oadp-ci.usersys.redhat.com:8080/d/5bpw5n1nk/prow-periodic?orgId=1

We need to see this pass more than once on 4.8 please and thank you!!!

weshayutin · 2022-02-01T20:47:20Z

/retest

weshayutin · 2022-02-01T23:54:47Z

Nice.. +1 /recheck ( why not :) )

weshayutin · 2022-02-02T00:02:26Z

hrm.. new tests did not yet trigger afaict..
/retest-required

weshayutin · 2022-02-02T03:08:38Z

/test pull-ci-openshift-oadp-operator-master-4.7-operator-e2e

openshift-ci · 2022-02-02T03:08:39Z

@weshayutin: The specified target(s) for /test were not found.
The following commands are available to trigger required jobs:

/test 4.7-ci-index
/test 4.7-images
/test 4.7-operator-e2e
/test 4.7-operator-unit-test
/test 4.8-ci-index
/test 4.8-images
/test 4.8-operator-e2e
/test 4.8-operator-unit-test

Use /test all to run all jobs.

In response to this:

/test pull-ci-openshift-oadp-operator-master-4.7-operator-e2e

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

weshayutin · 2022-02-02T03:09:01Z

/test 4.7-operator-e2e

weshayutin · 2022-02-02T03:09:19Z

/test 4.8-operator-e2e

weshayutin · 2022-02-02T03:10:24Z

/pony Twilight Sparkle

openshift-ci · 2022-02-02T03:10:28Z

@weshayutin:

In response to this:

/pony Twilight Sparkle

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

dymurray · 2022-02-02T13:53:05Z

/retest

weshayutin · 2022-02-02T16:42:49Z

/test 4.8-operator-e2e

weshayutin · 2022-02-02T19:54:20Z

/test 4.8-operator-e2e

weshayutin · 2022-02-02T20:47:33Z

last 4.8 was flake :)
/test 4.8-operator-e2e

openshift-ci · 2022-02-02T22:11:30Z

@mperetzred: all tests passed!

Full PR test history. Your PR dashboard.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

weshayutin · 2022-02-02T22:20:49Z

thanks for your patience @mperetzred :) +1 to merge from me.. after reviewing
https://prow.ci.openshift.org/pr-history/?org=openshift&repo=oadp-operator&pr=560

…n updateRegistrySecret (#679) * Replace carriage return when getting provider secrets for registry + E2E changes (#652) * Replace carriage return when getting provider secrets for registry Co-authored-by: GitHub Co-pilot <[email protected]> * add tests * replaceCarriageReturn unit test * Registry credentials can use other secret names Co-authored-by: GitHub Co-pilot <[email protected]> * Multi cloud E2E Updates (#568) * Adding changes from ci-multi-cloud branch * Updating flags in makefile * Updating flags in makefile * Updating flags in makefile * Update defaults * Fix helpers * Cleaning up makefile * Update makefile * Update kustomization * Cleaning up Makefile * Adding changes for AWS CredentialFile * Handling no default backuplocations * Removing comments * Adding config check in helpers * Fix AWS Test case * Fix basic review comments * genericTests... * Changing Credentials Mount Name for BSL when CredentialsFile key is used in Config - Fixes CI (#637) * Changing Credentials Mount Name for BSL for GCP * Fix DefaultPlugin for credentialsFile * E2E Tests: Fix azure templating name. (#573) * Fixing Azure to run locally * Aligning json * Handling Azure Parameters in CI Env using templates. (#582) * Adding azure parameters * Adding Openshift CI params * Update Test Suite and Helpers * Adding cred ref * Adding cred ref * Changing azure oadp cred dir to tmp * Fixing duplicate error * Removing OpenShift CI * Changing test instance name * Changing the AWS BSL Profile to default * Changing BslMountPath variable in registry controller * Replace carriage return when getting provider secrets for registry + E2E changes (#652) * Replace carriage return when getting provider secrets for registry Co-authored-by: GitHub Co-pilot <[email protected]> * add tests * replaceCarriageReturn unit test * Registry credentials can use other secret names Co-authored-by: GitHub Co-pilot <[email protected]> * fix missing err return for updateRegistrySecret function * go fmt * upgraded ginkgo on tests to ginkgo 2.0 (#560) Co-authored-by: Nitish Srivastava <[email protected]> Co-authored-by: GitHub Co-pilot <[email protected]> Co-authored-by: Deepak Raj D S <[email protected]> Co-authored-by: Shubham Pampattiwar <[email protected]> Co-authored-by: Maya Peretz <[email protected]>

openshift-ci bot requested review from JaydipGabani and jmontleon January 30, 2022 07:54

openshift-ci bot added the needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. label Jan 30, 2022

openshift-ci bot added ok-to-test Indicates a non-member PR verified by an org member that is safe to test. and removed needs-ok-to-test Indicates a PR that requires an org member to verify it is safe to test. labels Jan 31, 2022

mperetzred force-pushed the ginkgo2_upgrade branch from 3d31160 to 2b922cd Compare January 31, 2022 13:27

upgraded ginkgo on tests to ginkgo 2.0

f47d735

mperetzred force-pushed the ginkgo2_upgrade branch from 2b922cd to f47d735 Compare January 31, 2022 18:02

nitishSr reviewed Feb 1, 2022

View reviewed changes

mperetzred closed this Feb 1, 2022

mperetzred reopened this Feb 1, 2022

dymurray approved these changes Feb 3, 2022

View reviewed changes

dymurray merged commit d721247 into openshift:master Feb 3, 2022

mperetzred deleted the ginkgo2_upgrade branch February 11, 2022 12:49

kaovilai pushed a commit to kaovilai/oadp-operator that referenced this pull request May 10, 2022

upgraded ginkgo on tests to ginkgo 2.0 (openshift#560)

3daf030

kaovilai mentioned this pull request May 10, 2022

[OADP-463] cherrypicks 1.0 - carriage return + #678 missing err return updateRegistrySecret #679

Merged

kaovilai mentioned this pull request Jun 28, 2024

Bump the Ginkgo version to v2 vmware-tanzu/velero#7872

Closed

5 tasks

upgraded ginkgo on tests to ginkgo 2.0 #560

upgraded ginkgo on tests to ginkgo 2.0 #560

Uh oh!

Conversation

mperetzred commented Jan 30, 2022 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

openshift-ci bot commented Jan 30, 2022

Uh oh!

kaovilai commented Jan 31, 2022

Uh oh!

weshayutin commented Jan 31, 2022

Uh oh!

nitishSr Feb 1, 2022

Choose a reason for hiding this comment

Uh oh!

mperetzred Feb 1, 2022

Choose a reason for hiding this comment

Uh oh!

nitishSr Feb 1, 2022

Choose a reason for hiding this comment

Uh oh!

mperetzred Feb 1, 2022

Choose a reason for hiding this comment

Uh oh!

mperetzred commented Feb 1, 2022

Uh oh!

mperetzred commented Feb 1, 2022

Uh oh!

mperetzred commented Feb 1, 2022

Uh oh!

mperetzred commented Feb 1, 2022

Uh oh!

mperetzred commented Feb 1, 2022

Uh oh!

weshayutin commented Feb 1, 2022

Uh oh!

weshayutin commented Feb 1, 2022

Uh oh!

weshayutin commented Feb 1, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

openshift-ci bot commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

openshift-ci bot commented Feb 2, 2022

Uh oh!

dymurray commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

openshift-ci bot commented Feb 2, 2022

Uh oh!

weshayutin commented Feb 2, 2022

Uh oh!

Uh oh!

mperetzred commented Jan 30, 2022 •

edited

Loading