Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

upgraded ginkgo on tests to ginkgo 2.0 #560

Merged
merged 1 commit into from
Feb 3, 2022
Merged

upgraded ginkgo on tests to ginkgo 2.0 #560

merged 1 commit into from
Feb 3, 2022

Conversation

mperetzred
Copy link
Contributor

@mperetzred mperetzred commented Jan 30, 2022 •
edited

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
Copy link

openshift-ci bot commented Jan 30, 2022

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.

@openshift-ci 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
@kaovilai
Copy link
Member

/ok-to-test

@openshift-ci 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
@weshayutin
Copy link
Contributor

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

nitishSr
nitishSr reviewed Feb 1, 2022
View reviewed changes
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 {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
nitishSr reviewed Feb 1, 2022
View reviewed changes
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{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why this label has been applied only to first Entry?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

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
Copy link
Contributor Author

@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
Copy link
Contributor Author

/retest-required

@mperetzred mperetzred closed this Feb 1, 2022
@mperetzred
Copy link
Contributor Author

sorry, accidentally closed it.

@mperetzred mperetzred reopened this Feb 1, 2022
@mperetzred
Copy link
Contributor Author

/retest

@mperetzred
Copy link
Contributor Author

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

@weshayutin
Copy link
Contributor

@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
Copy link
Contributor

/retest

@weshayutin
Copy link
Contributor

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

@weshayutin
Copy link
Contributor

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

@weshayutin
Copy link
Contributor

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

@openshift-ci
Copy link

openshift-ci bot commented Feb 2, 2022

@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
Copy link
Contributor

/test 4.7-operator-e2e

@weshayutin
Copy link
Contributor

/test 4.8-operator-e2e

@weshayutin
Copy link
Contributor

/pony Twilight Sparkle

@openshift-ci
Copy link

openshift-ci bot commented Feb 2, 2022

@weshayutin: pony image

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
Copy link
Member

dymurray commented Feb 2, 2022

/retest

@weshayutin
Copy link
Contributor

/test 4.8-operator-e2e

1 similar comment
@weshayutin
Copy link
Contributor

/test 4.8-operator-e2e

@weshayutin
Copy link
Contributor

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

@openshift-ci
Copy link

openshift-ci bot commented Feb 2, 2022

@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
Copy link
Contributor

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

@dymurray dymurray merged commit d721247 into openshift:master Feb 3, 2022
@mperetzred 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
@mperetzred @kaovilai
upgraded ginkgo on tests to ginkgo 2.0 (openshift#560)
3daf030
@kaovilai kaovilai mentioned this pull request May 10, 2022
Merged
dymurray pushed a commit that referenced this pull request May 10, 2022
@kaovilai @nitishSr
@deepakraj1997 @shubham-pampattiwar @mperetzred
[OADP-463] cherrypicks 1.0 - carriage return + #678 missing err retur…
ce423c4 
…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 <idkwhatemailgithubcopilotuses@github.com>

* add tests

* replaceCarriageReturn unit test

* Registry credentials can use other secret names

Co-authored-by: GitHub Co-pilot <idkwhatemailgithubcopilotuses@github.com>

* 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 <idkwhatemailgithubcopilotuses@github.com>

* add tests

* replaceCarriageReturn unit test

* Registry credentials can use other secret names

Co-authored-by: GitHub Co-pilot <idkwhatemailgithubcopilotuses@github.com>

* fix missing err return for updateRegistrySecret function

* go fmt

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

Co-authored-by: Nitish Srivastava <43022982+nitishSr@users.noreply.github.com>
Co-authored-by: GitHub Co-pilot <idkwhatemailgithubcopilotuses@github.com>
Co-authored-by: Deepak Raj D S <drajds@redhat.com>
Co-authored-by: Shubham Pampattiwar <shubhampampattiwar7@gmail.com>
Co-authored-by: Maya Peretz <mperetz@redhat.com>
@kaovilai kaovilai mentioned this pull request Jun 28, 2024
Open
5 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@nitishSr nitishSr nitishSr left review comments

@dymurray dymurray dymurray approved these changes

@JaydipGabani JaydipGabani Awaiting requested review from JaydipGabani

@jmontleon jmontleon Awaiting requested review from jmontleon

Assignees
No one assigned
Labels
ok-to-test Indicates a non-member PR verified by an org member that is safe to test.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

None yet
5 participants
@mperetzred @kaovilai @weshayutin @dymurray @nitishSr