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

Sync Olive with master #2794

Merged
merged 28 commits into from
Mar 31, 2025
Merged

Conversation

frenzyfriday
Copy link
Collaborator

@frenzyfriday frenzyfriday commented Mar 17, 2025

As we discussed in the Prod Domain sync call today - I am rebasing the olive branch on main

m-blue-m and others added 8 commits March 6, 2025 13:17
No more releases for antelope, openstackclient test of fix should be skipped
on `whitebox-neutron-tempest-plugin` job.
themes

This commit adds two extra paramters for horizontest to modify pytest
test command and dynamically set xpath based on upstream and
downstream theme
Since watcher-operator uses master and not antelope container, create
a job to run in the master pipeline to ensure new content does not break
watcher.
Some jobs show an error that could be appearing thanks to a race
condition. This patch aims to prevent this case by first
waiting for a pod to start before running the next task.
This role will setup keycloak as and OpenID provider for user access
to openstack.
Recently, PR [1] improved the collection of logs from EDPM nodes adding
the networker nodes.
This new PR includes any nodes from groups whose name includes either
"networker" or "compute". This is relevant for BGP deployments, where
EDPM groups are named "<rack>-<nodetype>" (e.g. r1-computes) and for DCN
deployments where compute groups are named "dcn1_computes" and
"dcn2_computes".

[1] openstack-k8s-operators#2758

OSPRH-14643
It's observed that the rsh session is closed automatically reporting
rc=0 which is provoking false succeeds on the zuul job.

This patch guarantees that the pod has enough resources so the rsh
session is never killed.
@frenzyfriday frenzyfriday requested review from a team, rlobillo and eurijon as code owners March 17, 2025 13:09
Copy link
Contributor

openshift-ci bot commented Mar 17, 2025

[APPROVALNOTIFIER] This PR is NOT APPROVED

This pull-request has been approved by:
Once this PR has been reviewed and has the lgtm label, please assign lewisdenny for approval. For more information see the Code Review Process.

The full list of commands accepted by this bot can be found 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

@arxcruz
Copy link
Contributor

arxcruz commented Mar 17, 2025

/lgtm

arxcruz
arxcruz previously approved these changes Mar 17, 2025
bshewale
bshewale previously approved these changes Mar 17, 2025
sdatko
sdatko previously approved these changes Mar 17, 2025
dasm
dasm previously approved these changes Mar 17, 2025
@lewisdenny
Copy link
Collaborator

lewisdenny commented Mar 18, 2025

Hi @frenzyfriday, who created this branch? There was no update to the Zuul config so jobs won't be triggered.

If this branch going to be around for a while? If so the Zuul config needs to be updated in the config repo, if not you could just force merge.

Need some context if you would like help with this one.

edit I found some context on Slack that says a bot should do this sync and it shouldn't be manual, replied on Slack but have even more questions now :P

@frenzyfriday
Copy link
Collaborator Author

DNM, as I want the bot to do it: #2797

arxcruz and others added 5 commits March 18, 2025 14:53
Right now, all testproject are reporting to dlrn, no matter it is
required or not, this is overloading the dlrn service making it timeout.
Ideally, we should not have zuul variables here, but it is the easier
way to do it rather than update all job definition.
With this patch, ci-fmw allows to configure devscripts openshift_version
values "stable-<majorversion>" (e.g. "stable-4.18") which is dynamically
updated every time a new minor version becomes the latest stable.

Example:
https://mirror.openshift.com/pub/openshift-v4/clients/ocp/stable-4.18/
In build_openstack_packages role for building rpms from gerrit and
github, we are clonning the repo and checking out specific change.

With these tasks, we are not able to build dlrn rpms if we have multiple
prs/crs from same project.

But we want to build rpms from all changes.
In order to fix, Zuul knows how to checkout proper repos
with changes under test and from Depends-on.

DLRN always looks for clonned repos in DLRN data directory.
In order to use zuul clonned sources with DLRN, We are creating
symlink to dlrn data project directory and let's dlrn do the job.

Signed-off-by: Chandan Kumar (raukadah) <[email protected]>
(cherry picked from commit 32cfd4a)
The new CRC contains new SSH keypair type, so the previous keypair
type does not exists.

Signed-off-by: Daniel Pawlik <[email protected]>
The cifmw_openstack_service_images_content var should propably
contain only images with "*-manager-*".

Signed-off-by: Daniel Pawlik <[email protected]>
The new nodeset is based on CRC 2.48 (OCP 4.18).

Signed-off-by: Daniel Pawlik <[email protected]>
sdatko added 2 commits March 20, 2025 08:30
Some required projects do not have 18.0-fr2 branch,
so we override them to checkout the main branch by default.
When preparing a build for a matching branch, Zuul will merge
the jobs definitions and the override will happen only for FR2.

It would be still possible to use Depends-On to test specific
changes in the projects that are listed as required ones.
This reverts commit f30dc77.
It was merged accidentally and too early, before extensive testing.
danpawlik
danpawlik previously approved these changes Mar 21, 2025
danpawlik and others added 6 commits March 21, 2025 23:29
The yq tool might not be installed on every system,
so more safe for use would be jq.
Some CI jobs would be executed directly on the IBM private cloud
until Zuul CI will not make round robin between all providers.
The IBM hosts have less usage so some part of jobs might less fail.
Temporary use only IBM hosts for some molecule CI jobs until Zuul
will round robin jobs between all providers.

Depends-On: openstack-k8s-operators#2812
@frenzyfriday frenzyfriday enabled auto-merge (rebase) March 24, 2025 12:08
@frenzyfriday frenzyfriday dismissed stale reviews from danpawlik, dasm, sdatko, bshewale, and arxcruz via ac52dce March 24, 2025 12:10
@openshift-ci openshift-ci bot removed the lgtm label Mar 24, 2025
Copy link
Contributor

openshift-ci bot commented Mar 24, 2025

New changes are detected. LGTM label has been removed.

@frenzyfriday frenzyfriday disabled auto-merge March 31, 2025 10:45
@frenzyfriday frenzyfriday merged commit 1b5b7ee into openstack-k8s-operators:olive Mar 31, 2025
40 checks passed
@frenzyfriday frenzyfriday deleted the olive branch March 31, 2025 13:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.