Skip to content

Conversation

chiragkyal
Copy link
Member

@chiragkyal chiragkyal commented Jan 30, 2025

Description of the change:

  • Updates openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection as per v1.36.1.
  • Updates openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh script to align with the updated requirements.yml.
  • Adds new Make targets update-collections and check-collections for ansible-collections modification.
  • Updates downstream e2e test to use upstream testdata/memcached-molecule-operator.
    • Adds RBAC permission for project.openshift.io
    • Adds --ignore-not-found with make undeploy to avoid errors when some kustomized resources are deleted with namespace deletion.
  • Removes downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory because of the utilization of upstream testdata.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

@openshift-ci-robot openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 30, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 30, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

Motivation for the change:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot requested review from fabianvf and oceanc80 January 30, 2025 14:52
@openshift-ci openshift-ci bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 30, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 30, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

Steps followed

  • Updated openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection.
  • Updated openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh

Motivation for the change:

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 31, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Update ansible-collections to match the upstream requirements
  • Re-generate the downstream testdata using Operator SDK Binary v1.38.0

Steps followed

  • Updated openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection.
  • Updated openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh

Re-generate downstream testdata

export ARCH=$(case $(uname -m) in x86_64) echo -n amd64 ;; aarch64) echo -n arm64 ;; *) echo -n $(uname -m) ;; esac)
export OS=$(uname | awk '{print tolower($0)}')

export OPERATOR_SDK_DL_URL=https://github.com/operator-framework/operator-sdk/releases/download/v1.38.0
curl -LO ${OPERATOR_SDK_DL_URL}/operator-sdk_${OS}_${ARCH}

chmod +x operator-sdk_${OS}_${ARCH} && sudo mv operator-sdk_${OS}_${ARCH} /usr/local/bin/operator-sdk
$ operator-sdk version   
                                                                                                      
operator-sdk version: "v1.38.0", commit: "0735b20c84e5c33cda4ed87daa3c21dcdc01bb79", kubernetes version: "1.30.0", go version: "go1.22.5", GOOS: "linux", GOARCH: "amd64"
  • Generated the testdata using hack/generate/samples/generate_testdata.go script
    • Applied the following patch locally to create the MemcachedSample instead of MoleculeSample to be used in the e2e job.
    • Note: Once the scaffolding is done, revert back to the original generate_testdata.go.
diff --git a/hack/generate/samples/generate_testdata.go b/hack/generate/samples/generate_testdata.go
index ebf07ec..a6d328b 100644
--- a/hack/generate/samples/generate_testdata.go
+++ b/hack/generate/samples/generate_testdata.go
@@ -49,9 +49,9 @@ func main() {
       }

       // samplesPath is the path where all samples should be generated
-       samplesPath := filepath.Join(wd, "testdata")
+       samplesPath := filepath.Join(wd, "openshift", "ci", "testdata")
       log.Infof("writing sample directories under %s", samplesPath)

       log.Infof("creating Ansible Memcached Sample")
-       ansible.GenerateMoleculeSample(samplesPath)
+       ansible.GenerateMemcachedSamples(samplesPath)
}
go run hack/generate/samples/generate_testdata.go

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@chiragkyal chiragkyal force-pushed the update-e2e branch 2 times, most recently from 254ac8a to d029676 Compare January 31, 2025 18:00
@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 31, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Updated openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection.
  • Updated openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh
  • Add new make targets update-collections and check-collections for ansible-collections modification.
  • Updated downstream e2e test to use upstream testdata/memcached-molecule-operator.
  • Removed downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Jan 31, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Updated openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection.
  • Updated openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh
  • Added new make targets update-collections and check-collections for ansible-collections modification.
  • Updated downstream e2e test to use upstream testdata/memcached-molecule-operator.
  • Removed downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@chiragkyal chiragkyal changed the title OAPE-36: Update ansible-collections to match the upstream requirements OAPE-36: Update ansible-collections and downstream e2e test to match upstream Jan 31, 2025
@chiragkyal
Copy link
Member Author

/cc @arkadeepsen

@openshift-ci openshift-ci bot requested a review from arkadeepsen February 2, 2025 11:01
@arkadeepsen
Copy link
Member

The updated e2e test is working fine: https://prow.ci.openshift.org/view/gs/test-platform-results/pr-logs/pull/openshift_ansible-operator-plugins/35/pull-ci-openshift-ansible-operator-plugins-main-e2e-ansible/1885387903203282944

/lgtm

/cc @TrilokGeer
for final review and approval

@openshift-ci openshift-ci bot requested a review from TrilokGeer February 3, 2025 03:44
@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2025
FROM openshift-ansible-operator-plugins

COPY openshift/ci/testdata/ansible/memcached-operator/requirements.yml ${HOME}/requirements.yml
COPY testdata/memcached-molecule-operator/requirements.yml ${HOME}/requirements.yml
Copy link
Contributor

@TrilokGeer TrilokGeer Feb 3, 2025

Choose a reason for hiding this comment

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

Is there any path change in CI ?

Copy link
Member Author

Choose a reason for hiding this comment

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

We don't need to change the CI job setup in https://github.com/openshift/release, because the make targets and Dockerfile paths remain unchanged.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 3, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Updated openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection.
  • Updated openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh script. This is required to be updated as per the updated requirements.yml
  • Added new make targets update-collections and check-collections for ansible-collections modification.
  • Updated downstream e2e test to use upstream testdata/memcached-molecule-operator.
    • added RBAC permission for project.openshift.io
    • added --ignore-not-found with make undeploy to avoid errors when some kustomized resources are deleted with namespace deletion.
  • Removed downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory because of utilization of upstream testdata.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Feb 3, 2025
@chiragkyal chiragkyal changed the title OAPE-36: Update ansible-collections and downstream e2e test to match upstream OAPE-36: Updates ansible-collections and downstream e2e test to match upstream Feb 3, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 3, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Updates openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection as per v1.36.1.
  • Updates openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh script to align with the updated requirements.yml.
  • Adds new Make targets update-collections and check-collections for ansible-collections modification.
  • Updates downstream e2e test to use upstream testdata/memcached-molecule-operator.
    • Adds RBAC permission for project.openshift.io
    • Adds --ignore-not-found with make undeploy to avoid errors when some kustomized resources are deleted with namespace deletion.
  • Removes downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory because of the utilization of upstream testdata.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@chiragkyal chiragkyal changed the title OAPE-36: Updates ansible-collections and downstream e2e test to match upstream OAPE-36: Update ansible-collections and downstream e2e test to match upstream v1.36.1 Feb 3, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 3, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Update openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection as per v1.36.1.
  • Update openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh script to align with the updated requirements.yml.
  • Add new Make targets update-collections and check-collections for ansible-collections modification.
  • Update downstream e2e test to use upstream testdata/memcached-molecule-operator.
    • Add RBAC permission for project.openshift.io
    • Add --ignore-not-found with make undeploy to avoid errors when some kustomized resources are deleted with namespace deletion.
  • Remove downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory because of the utilization of upstream testdata.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 4, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Updates openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection as per v1.36.1.
  • Updates openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh script to align with the updated requirements.yml.
  • Adds new Make targets update-collections and check-collections for ansible-collections modification.
  • Updates downstream e2e test to use upstream testdata/memcached-molecule-operator.
    • Adds RBAC permission for project.openshift.io
    • Adds --ignore-not-found with make undeploy to avoid errors when some kustomized resources are deleted with namespace deletion.
  • Removes downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory because of the utilization of upstream testdata.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@chiragkyal chiragkyal changed the title OAPE-36: Update ansible-collections and downstream e2e test to match upstream v1.36.1 OAPE-36: Updates ansible-collections and downstream e2e test to match upstream v1.36.1 Feb 4, 2025
…l` file

to match the upstream requirements for ansible-collection as per v1.36.1

Signed-off-by: chiragkyal <ckyal@redhat.com>
…ions` directory

by running `openshift/release/ansible/update-collections.sh` script
to align with the updated requirements.yml

Signed-off-by: chiragkyal <ckyal@redhat.com>
…eck-collections` for ansible-collections modification

Signed-off-by: chiragkyal <ckyal@redhat.com>
…ata/memcached-molecule-operator`

- Adds RBAC permission for `project.openshift.io`.
- Adds `--ignore-not-found` with `make undeploy` to avoid errors
when some kustomized resources are deleted with namespace deletion.

Signed-off-by: chiragkyal <ckyal@redhat.com>
…a/ansible/memcached-operator` directory

because of the utilization of upstream testdata.

Signed-off-by: chiragkyal <ckyal@redhat.com>
Copy link

openshift-ci bot commented Feb 4, 2025

@chiragkyal: 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.

@TrilokGeer
Copy link
Contributor

/lgtm
/approve

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Feb 4, 2025
Copy link

openshift-ci bot commented Feb 4, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: chiragkyal, TrilokGeer

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:
  • OWNERS [TrilokGeer,chiragkyal]

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

@emmajiafan
Copy link

/label qe-approved

@openshift-ci openshift-ci bot added the qe-approved Signifies that QE has signed off on this PR label Feb 4, 2025
@openshift-ci-robot
Copy link

openshift-ci-robot commented Feb 4, 2025

@chiragkyal: This pull request references OAPE-36 which is a valid jira issue.

Warning: The referenced jira issue has an invalid target version for the target branch this PR targets: expected the story to target the "4.19.0" version, but no target version was set.

In response to this:

Description of the change:

  • Updates openshift/release/ansible/requirements.yml file to match the upstream requirements for ansible-collection as per v1.36.1.
  • Updates openshift/release/ansible/ansible_collections directory by running sh openshift/release/ansible/update-collections.sh script to align with the updated requirements.yml.
  • Adds new Make targets update-collections and check-collections for ansible-collections modification.
  • Updates downstream e2e test to use upstream testdata/memcached-molecule-operator.
    • Adds RBAC permission for project.openshift.io
    • Adds --ignore-not-found with make undeploy to avoid errors when some kustomized resources are deleted with namespace deletion.
  • Removes downstream testdata: openshift/ci/testdata/ansible/memcached-operator directory because of the utilization of upstream testdata.

Motivation for the change:
https://issues.redhat.com//browse/OAPE-36

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 openshift-eng/jira-lifecycle-plugin repository.

@openshift-merge-bot openshift-merge-bot bot merged commit 59bdab3 into openshift:main Feb 4, 2025
5 checks passed
@chiragkyal chiragkyal deleted the update-e2e branch February 4, 2025 09:18
@chiragkyal
Copy link
Member Author

/cherrypick release-4.18

@openshift-cherrypick-robot
Copy link
Contributor

@chiragkyal: Failed to get PR patch from GitHub. This PR will need to be manually cherrypicked.

Error messagestatus code 406 not one of [200], body: {"message":"Sorry, the diff exceeded the maximum number of files (300). Consider using 'List pull requests files' API or locally cloning the repository instead.","errors":[{"resource":"PullRequest","field":"diff","code":"too_large"}],"documentation_url":"https://docs.github.com/rest/pulls/pulls#list-pull-requests-files","status":"406"}

In response to this:

/cherrypick release-4.18

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.

@openshift-bot
Copy link

[ART PR BUILD NOTIFIER]

Distgit: openshift-enterprise-ansible-operator
This PR has been included in build openshift-enterprise-ansible-operator-container-v4.19.0-202502041111.p0.g59bdab3.assembly.stream.el9.
All builds following this will include this PR.

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. jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. lgtm Indicates that a PR is ready to be merged. qe-approved Signifies that QE has signed off on this PR

Projects

None yet

Development

Successfully merging this pull request may close these issues.

7 participants