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.

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

run oadp-operator e2e test from the velero repo #353

Merged
merged 10 commits into from
Oct 17, 2024

Conversation

weshayutin
Copy link

execute openshift/oadp-operator e2e tests directly against the velero repo locally or via prow ci

Thank you for contributing to Velero!

Please add a summary of your change

execute openshift/oadp-operator e2e tests directly against the velero repo locally or via prow ci

to test

optional: update the VELERO_IMAGE variable
execute: make -f Makefile.prow test-e2e

execute openshift/oadp-operator e2e tests directly
against the velero repo locally or via prow ci

Signed-off-by: Wesley Hayutin <[email protected]>
@weshayutin
Copy link
Author

locally tested:

    Mongo application DATAMOVER
    /tmp/oadp-operator/tests/e2e/must-gather_suite_test.go:75
------------------------------
[AfterSuite] 
/tmp/oadp-operator/tests/e2e/e2e_suite_test.go:198
  > Enter [AfterSuite] TOP-LEVEL - /tmp/oadp-operator/tests/e2e/e2e_suite_test.go:198 @ 10/15/24 13:36:33.389
2024/10/15 13:36:33 Deleting Secrets
2024/10/15 13:36:33 Deleting DPA
  < Exit [AfterSuite] TOP-LEVEL - /tmp/oadp-operator/tests/e2e/e2e_suite_test.go:198 @ 10/15/24 13:36:33.595 (206ms)
[AfterSuite] PASSED [0.206 seconds]
------------------------------

Ran 1 of 33 Specs in 253.674 seconds
SUCCESS! -- 1 Passed | 0 Failed | 0 Pending | 32 Skipped
PASS

Makefile.prow Outdated Show resolved Hide resolved
Makefile.prow Outdated Show resolved Hide resolved
Makefile.prow Outdated Show resolved Hide resolved
Signed-off-by: Wesley Hayutin <[email protected]>
@mateusoliveira43
Copy link

mateusoliveira43 commented Oct 16, 2024

tested and idea is working (i.e. unsupported override is used in tests)

spec:
  backupLocations:
    - velero:
        config:
          profile: default
          region: ...
          s3ForcePathStyle: 'true'
          s3Url: '...'
        credential:
          key: cloud
          name: bsl-cloud-credentials-ibmcloud
        default: true
        objectStorage:
          bucket: ...
          prefix: velero-e2e-...
        provider: aws
  configuration:
    nodeAgent:
      enable: true
      podConfig:
        resourceAllocations: {}
      uploaderType: kopia
    velero:
      defaultPlugins:
        - openshift
        - aws
        - csi
      featureFlags:
        - EnableCSI
      logLevel: debug
  podDnsConfig: {}
  unsupportedOverrides:
    awsPluginImageFqin: ''
    azurePluginImageFqin: ''
    gcpPluginImageFqin: ''
    kubevirtPluginImageFqin: ''
    nonAdminControllerImageFqin: ''
    openshiftPluginImageFqin: ''
    resticRestoreImageFqin: ''
    veleroImageFqin: 'quay.io/konveyor/velero:latest'

But it still not clear to me how this will work in CI. Along CI image name, we also need OADP operator installed to run the tests

Copy link
Member

@kaovilai kaovilai left a comment

Choose a reason for hiding this comment

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

simplifies ENV used in Makefile

Makefile.prow Outdated Show resolved Hide resolved
Makefile.prow Outdated Show resolved Hide resolved
@kaovilai
Copy link
Member

we also need OADP operator installed to run the tests

hopefully ocp/release repo test config can make it so operator is already installed, if not we can follow up later.

@weshayutin
Copy link
Author

tested and idea is working (i.e. unsupported override is used in tests)

spec:
  backupLocations:
    - velero:
        config:
          profile: default
          region: ...
          s3ForcePathStyle: 'true'
          s3Url: '...'
        credential:
          key: cloud
          name: bsl-cloud-credentials-ibmcloud
        default: true
        objectStorage:
          bucket: ...
          prefix: velero-e2e-...
        provider: aws
  configuration:
    nodeAgent:
      enable: true
      podConfig:
        resourceAllocations: {}
      uploaderType: kopia
    velero:
      defaultPlugins:
        - openshift
        - aws
        - csi
      featureFlags:
        - EnableCSI
      logLevel: debug
  podDnsConfig: {}
  unsupportedOverrides:
    awsPluginImageFqin: ''
    azurePluginImageFqin: ''
    gcpPluginImageFqin: ''
    kubevirtPluginImageFqin: ''
    nonAdminControllerImageFqin: ''
    openshiftPluginImageFqin: ''
    resticRestoreImageFqin: ''
    veleroImageFqin: 'quay.io/konveyor/velero:latest'

But it still not clear to me how this will work in CI. Along CI image name, we also need OADP operator installed to run the tests

ya.. not sure if we'll do that via prow or via this makefile. If we DO need to do it via this makefile, wouldn't just a be a make deploy-olm from the oadp-operator dir? EASY no?

@kaovilai
Copy link
Member

make deploy-olm from the oadp-operator dir? EASY no?

deploy, and setup credentials stuff in prow so to not expose secrets in this makefile

Makefile.prow Outdated Show resolved Hide resolved
Co-authored-by: Tiger Kaovilai <[email protected]>
Copy link

openshift-ci bot commented Oct 16, 2024

@weshayutin: 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-sigs/prow repository. I understand the commands that are listed here.

@mpryc
Copy link

mpryc commented Oct 17, 2024

/lgtm

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Oct 17, 2024
@mpryc
Copy link

mpryc commented Oct 17, 2024

/approve

@mpryc
Copy link

mpryc commented Oct 17, 2024

/gentle-ask-to-merge-this-pr Openshift CI, could you please kindly merge this PR as it has already been approved and has the lgtm label. Let's get this one through, shall we?

@kaovilai I think the following change (link below) broke velero CI as we don't have DOWNSTREAM_OWNERS file here?

openshift/release@cd8b87b#diff-a9035bbaee5af66130c81cfd0b97df589a7d2e22e87ad9d3800851407967c07bR695

The DOWNSTREAM_OWNERS should be in the konveyor-dev branch of this repository:
https://github.com/openshift/velero/blob/konveyor-dev/DOWNSTREAM_OWNERS

@kaovilai
Copy link
Member

It's not broken from before. The change in release only allows us to add owners file without carrying conflicting changes with upstream owners. Upstream owners file may not be in the right format for prow or have our people on it anyways.

@kaovilai kaovilai added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Oct 17, 2024
Copy link

openshift-ci bot commented Oct 17, 2024

[APPROVALNOTIFIER] This PR is APPROVED

Approval requirements bypassed by manually added approval.

This pull-request has been approved by: kaovilai, mpryc, weshayutin

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@kaovilai
Copy link
Member

Demo of manual label override to continue auto merge

@openshift-merge-bot openshift-merge-bot bot merged commit fe3907e into openshift:konveyor-dev Oct 17, 2024
3 checks passed
sseago pushed a commit to sseago/velero that referenced this pull request Dec 11, 2024
* run oadp-operator e2e test from the velero repo

execute openshift/oadp-operator e2e tests directly
against the velero repo locally or via prow ci

Signed-off-by: Wesley Hayutin <[email protected]>

* update variable names, add a cleanup

* make sure env variable overrides default velero_image

Signed-off-by: Wesley Hayutin <[email protected]>

* add options to build, push, and only test

Signed-off-by: Wesley Hayutin <[email protected]>

* add arch to name

Signed-off-by: Wesley Hayutin <[email protected]>

* remove duplicated clean/rm operator checkout

* simplify by dropping export var and use a oneliner

Co-authored-by: Tiger Kaovilai <[email protected]>

* drop export and use oneliner

Co-authored-by: Tiger Kaovilai <[email protected]>

* just in case, allow oadp to be deployed from makefile

Signed-off-by: Wesley Hayutin <[email protected]>

* Update Makefile.prow

Co-authored-by: Tiger Kaovilai <[email protected]>

---------

Signed-off-by: Wesley Hayutin <[email protected]>
Co-authored-by: Tiger Kaovilai <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants