Skip to content

OAPE-194: UPSTREAM: <carry>: Add downstream README file #46

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

Merged
merged 1 commit into from
Jun 10, 2025

Conversation

arkadeepsen
Copy link
Member

Description of the change:

This PR adds a README file for the downstream operations.

Motivation for the change:

The downstream operations are not well documented. This PR tries to address that by adding the README file.

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

openshift-ci-robot commented May 29, 2025

@arkadeepsen: This pull request references OAPE-194 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.20.0" version, but no target version was set.

In response to this:

Description of the change:

This PR adds a README file for the downstream operations.

Motivation for the change:

The downstream operations are not well documented. This PR tries to address that by adding the README file.

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 added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label May 29, 2025
Copy link
Member

@chiragkyal chiragkyal left a comment

Choose a reason for hiding this comment

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

Mostly nits. Thanks for the documentation.


The downstream artifacts are as follows:

* openshift - contains files for building downstream ansible operator base image
Copy link
Member

Choose a reason for hiding this comment

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

nit: Please add quotes for folder/file names...Same for all the next bullets.

Suggested change
* openshift - contains files for building downstream ansible operator base image
* `openshift` - contains files for building downstream ansible operator base image

The downstream artifacts are as follows:

* openshift - contains files for building downstream ansible operator base image
* openshift/ci - contains the CI related build files
Copy link
Member

Choose a reason for hiding this comment

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

nit: Periods at the end of the sentences.

Suggested change
* openshift/ci - contains the CI related build files
* openshift/ci - contains the CI related build files.

* openshift - contains files for building downstream ansible operator base image
* openshift/ci - contains the CI related build files
* openshift/hack - contains the scripts for updating downstream files
* openshift/release/ansible - ansible operator release files
Copy link
Member

Choose a reason for hiding this comment

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

openshift/release/ansible mostly contains the collections I think

openshift https://github.com/openshift/ansible-operator-plugins.git (fetch)
openshift no_push (push)
origin [email protected]:arkadeepsen/ansible-operator-plugins.git (fetch)
origin [email protected]:arkadeepsen/ansible-operator-plugins.git (push)
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
origin [email protected]:arkadeepsen/ansible-operator-plugins.git (push)
origin [email protected]:username/ansible-operator-plugins.git (push)

```
## New release to main

Once the `upstream` has been verified. You can now sync the upstream release tag
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Once the `upstream` has been verified. You can now sync the upstream release tag
Once the `upstream` has been verified, you can now sync the upstream release tag

...
```

After the commits are listed, the vendor directory is updata:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
After the commits are listed, the vendor directory is updata:
After the commits are listed, the vendor directory is updated

Here is the output of running the above script.

```
$ ./openshift/hack/rebase_upstream.sh v1.37.2 release-4.17
Copy link
Member

Choose a reason for hiding this comment

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

Please hide the output by default.

and the requirements files in the `./openshift` directory are properly generated. This will require manual intervention and
inspection.

Once these directories have been verified, create a release PR downstream:
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
Once these directories have been verified, create a release PR downstream:
Once these directories have been verified, create a rebase PR downstream:

can be used. This script runs the upstream
[`pip_find_builddeps.py`](https://raw.githubusercontent.com/containerbuildsystem/cachito/master/bin/pip_find_builddeps.py)
script repeatedly for each python package to find the corresponding build dependencies. It needs the requirements.txt file
generated from the upstream Pipfile and Pipfile.lock files.
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
generated from the upstream Pipfile and Pipfile.lock files.
generated from the upstream `images/Pipfile` and `images/Pipfile.lock` files.

```
git push origin v1.38.0-rebase-main
```

Copy link
Member

Choose a reason for hiding this comment

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

We need to add another step (with a highlight maybe) here to get a test built out by the ART team before merging the PR.

@arkadeepsen
Copy link
Member Author

/skip

Copy link
Member

@chiragkyal chiragkyal left a comment

Choose a reason for hiding this comment

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

Thanks for the changes.
/lgtm

information about the output see the [breakdown of rebase_upstream.sh
output](#breakdown-of-rebase_upstreamsh-output) section below.

At this point, you _must_ verify if everything looks. Ensure that the `./openshift/release/ansible/ansible_collections` directory
Copy link
Member

Choose a reason for hiding this comment

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

Suggested change
At this point, you _must_ verify if everything looks. Ensure that the `./openshift/release/ansible/ansible_collections` directory
At this point, you _must_ verify if everything looks okay. Ensure that the `./openshift/release/ansible/ansible_collections` directory

@openshift-ci openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jun 6, 2025
@openshift-ci openshift-ci bot removed the lgtm Indicates that a PR is ready to be merged. label Jun 9, 2025
@chiragkyal
Copy link
Member

/lgtm
/approve
/retest

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

openshift-ci bot commented Jun 9, 2025

[APPROVALNOTIFIER] This PR is APPROVED

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

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 [arkadeepsen,chiragkyal]

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

@chiragkyal
Copy link
Member

/label qe-approved
no impact

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

openshift-ci-robot commented Jun 9, 2025

@arkadeepsen: This pull request references OAPE-194 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.20.0" version, but no target version was set.

In response to this:

Description of the change:

This PR adds a README file for the downstream operations.

Motivation for the change:

The downstream operations are not well documented. This PR tries to address that by adding the README file.

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

/retest-required

Remaining retests: 0 against base HEAD 88cac2a and 2 for PR HEAD 9f87a5e in total

@arkadeepsen
Copy link
Member Author

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 88cac2a and 2 for PR HEAD 9f87a5e in total

@arkadeepsen
Copy link
Member Author

/retest

@openshift-ci-robot
Copy link

/retest-required

Remaining retests: 0 against base HEAD 88cac2a and 2 for PR HEAD 9f87a5e in total

@chiragkyal
Copy link
Member

/test all

I want to see if images is passing or not. Looks like we're hitting this issue.

@arkadeepsen
Copy link
Member Author

/test all

I want to see if images is passing or not. Looks like we're hitting this issue.

That should not cause an issue in the CI. The issue is for building the image in the OSBS environment.

@arkadeepsen
Copy link
Member Author

/retest

Copy link

openshift-ci bot commented Jun 10, 2025

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

@openshift-merge-bot openshift-merge-bot bot merged commit 271ad55 into openshift:main Jun 10, 2025
7 checks passed
@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.20.0-202506100817.p0.g271ad55.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.

4 participants