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

[bop]Build RPM pkgs from OpenDev Depends On #1418

Merged
merged 1 commit into from
Apr 16, 2024

Conversation

raukadah
Copy link
Contributor

@raukadah raukadah commented Apr 8, 2024

This pull requests improves following things:

  • Update default value of cifmw_bop_build_repo_dir so that we can
    collect DLRN related data in the logs

  • Change cifmw_bop_openstack_release var default value to antelope.

  • Introduced more vars to construct cifmw_bop_change_list.

    • cifmw_bop_branchless_projects: List of project does not have stable branches.
    • cifmw_bop_skipped_projects: List of projects on which DLRN build needs to be skipped.
    • cifmw_bop_change_list: Zuul Change list constructed while using Depends-On in CI to build rpm packages using DLRN.
    • cifmw_bop_release_mapping: A list of openstack release names and their respective branch names.
  • Construct cifmw_bop_change_list from OpenDev Depends On based on the
    conditions defined in README

  • It also updates the conditional to set proper rdo branches and update
    DLRN project.ini for branchful and branchless project.
    For branchful project: rdo-{project branch}
    For branchless project: rdo-{openstack_release}
    for master: rdo-master

  • Add tasks to clone proper changes from gerrit refspec and github pull
    requests.

  • Builds the RPM after that.

Test Results: openstack-k8s-operators/tcib#162 (comment)

As a pull request owner and reviewers, I checked that:

  • Appropriate testing is done and actually running
  • Appropriate documentation exists and/or is up-to-date:
    • README in the role
    • Content of the docs/source is reflecting the changes

@raukadah raukadah marked this pull request as draft April 8, 2024 09:06
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
@raukadah raukadah force-pushed the zuul_build_os_packages branch 2 times, most recently from 1a5fb41 to 49927cb Compare April 8, 2024 09:34
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
@danpawlik
Copy link
Member

recheck

raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
raukadah added a commit to raukadah/tcib that referenced this pull request Apr 8, 2024
@raukadah raukadah force-pushed the zuul_build_os_packages branch 4 times, most recently from 23e9ecd to 49fcdb0 Compare April 15, 2024 08:12
@raukadah
Copy link
Contributor Author

/hold cancel

- name: Create a directory to hold the rpms
ansible.builtin.file:
path: '{{ cifmw_bop_gating_repo }}'
- name: Create a temproary directory to hold the rpms
Copy link
Contributor

Choose a reason for hiding this comment

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

nit s/temproary/temporary

Copy link
Contributor

Choose a reason for hiding this comment

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

same change exists in #1457 are you going to merge them into one review or update one of them/rebase?

@cjeanner
Copy link
Collaborator

Care to trigger a molecule job for the pkg_build role? It's dependent and we already broke it with changes in bop role :) (also asked on #1457 - I see it's included in this PR, so you can trigger with a depends-on this 1418 one)

@cjeanner
Copy link
Collaborator

/hold

let's wait for #1457 to merge first if you don't mind.

Copy link

Build failed (check pipeline). Post recheck (without leading slash)
to rerun all jobs. Make sure the failure cause has been resolved before
you rerun jobs.

https://review.rdoproject.org/zuul/buildset/3087ab7effbb463ca6df23a589420ce4

✔️ openstack-k8s-operators-content-provider SUCCESS in 46m 36s
podified-multinode-edpm-deployment-crc FAILURE in 28m 18s
✔️ noop SUCCESS in 0s
✔️ cifmw-pod-pre-commit SUCCESS in 8m 36s (non-voting)
✔️ cifmw-tcib SUCCESS in 36m 23s
✔️ cifmw-molecule-build_openstack_packages SUCCESS in 11m 49s
✔️ cifmw-molecule-pkg_build SUCCESS in 11m 35s

@@ -16,23 +16,65 @@ An Ansible role for generating custom RPMSs of OpenStack Projects using DLRN
* `cifmw_bop_openstack_release`: (String) The default release of OpenStack project. Defaults to `master`.
* `cifmw_bop_osp_release`: (String) The downstream openstack release name.
* `cifmw_bop_openstack_project_path`: (String) The full path of openstack cloned project to be built.
* `cifmw_bop_gating_repo`: (String) The path of directory to store the generated rpms.
* `cifmw_bop_gating_repo_dest`: (String) The path of directory to store gating repo file and repo metadata.
Copy link
Contributor

Choose a reason for hiding this comment

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

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Thank you @marios for the review, PR#1457 is now merged. I have rebase this pr from main.

- name: Create a directory to hold the rpms
ansible.builtin.file:
path: '{{ cifmw_bop_gating_repo }}'
- name: Create a temproary directory to hold the rpms
Copy link
Contributor

Choose a reason for hiding this comment

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

same change exists in #1457 are you going to merge them into one review or update one of them/rebase?

@cjeanner
Copy link
Collaborator

/hold cancel
/approve

the patch went through test-project; it has been rebased against main once #1457 has merged, so we're good to go.

Copy link
Contributor

openshift-ci bot commented Apr 16, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: cjeanner

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

_project_branch: "{{ cifmw_bop_openstack_release }}"
when: _change.branch != cifmw_bop_openstack_release

- name: Set proper branch name
Copy link
Contributor

Choose a reason for hiding this comment

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

Do we need this task and the one above? It looks like we always end up using the value of cifmw_bop_openstack_release.

Copy link
Contributor

Choose a reason for hiding this comment

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

that said, it could be done in a follow up, if this is blocking something

Copy link
Contributor Author

Choose a reason for hiding this comment

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

We need both the tasks. Let me change the wording of the task to make it clearer.

This pull requests improves following things:
- Update default value of cifmw_bop_build_repo_dir so that we can
  collect DLRN related data in the logs
- Change cifmw_bop_openstack_release var default value to antelope.
- Introduced more vars to construct cifmw_bop_change_list.
  * `cifmw_bop_branchless_projects`: List of project does not have stable branches.
  * `cifmw_bop_skipped_projects`: List of projects on which DLRN build needs to be skipped.
  * `cifmw_bop_change_list`: Zuul Change list constructed while using Depends-On in CI to build rpm packages using DLRN.
  * `cifmw_bop_release_mapping`: A list of openstack release names and their respective branch names.

- Construct cifmw_bop_change_list from OpenDev Depends On based on the
  conditions defined in README
- It also updates the conditional to set proper rdo branches and update
  DLRN project.ini for branchful and branchless project.
  For branchful project: rdo-{project branch}
  For branchless project: rdo-{openstack_release}
  for master: rdo-master
- Add tasks to clone proper changes from gerrit refspec and github pull
  requests.
- Builds the RPM after that.

Signed-off-by: Chandan Kumar <raukadah@gmail.com>
@openshift-ci openshift-ci bot added the lgtm label Apr 16, 2024
@raukadah
Copy link
Contributor Author

recheck

@openshift-merge-bot openshift-merge-bot bot merged commit 2335a7a into main Apr 16, 2024
8 checks passed
@openshift-merge-bot openshift-merge-bot bot deleted the zuul_build_os_packages branch April 16, 2024 17:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
6 participants