NO-JIRA: CARRY: Restore OWNERS to upstream #224

dulek · 2023-10-12T10:56:05Z

We are now using DOWNSTREAM_OWNERS instead. We can restore OWNERS and OWNERS_ALIASES to upstream to avoid future merge conflicts.

/hold

This reverts commit 68be840. This release-specific commit should not be on master.

…penshift-4.9-ose-openstack-cinder-csi-driver Updating ose-openstack-cinder-csi-driver images to be consistent with ART

Upstream merge

…nto master

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

…nto master

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

…nto master

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

imagebuilder used by OSBS/brew to create the product images does not handle slashes in `COPY` commands well. See e.g. openshift/imagebuilder#139. This commit ensures the tree is actually present in the container.

Fix ART build

…nt with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/6fd8165c0ed89e08ff4603311951ca7521e547cd/images/ose-openstack-cloud-controller-manager.yml

…penshift-4.9-ose-openstack-cloud-controller-manager Updating ose-openstack-cloud-controller-manager images to be consistent with ART

…nto master

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

…nto master

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

Remove Fedosin from Owners

Add 'nouuid' mount option to all XFS mounts to be able to mount a volume and its restored snapshot on the same node. Without the option, such a mount fails, because XFS detects that two different volumes with the same filesystem UUID are being mounted.

Use the same pattern across all Dockerfiles and remove duplicates. Also remove the dockerfile for the deprecated Manila provisioner, for which the image is not used any more in 4.9.

Bug 1996783: Bump to Go v1.16 and OCP v4.9

The file named `.ci-operator.yaml` governs which image is used in the OpenShift CI. This has to be updated as well.

Bug 1996783: Bump Go to v1.16 - fixup

Bug 1996031: Merge upstream tag 'v1.22.0'

Bug 1988374: UPSTREAM: 1988374: Disable uuid checks on XFS (kubernetes#1614)

…ages to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/44bc7dde7a1abf6a25bf16d7d05e98599a9783e1/images/ose-openstack-cloud-controller-manager.yml

…penshift-4.10-ose-openstack-cloud-controller-manager Updating ose-openstack-cloud-controller-manager images to be consistent with ART

openshift-ci · 2024-01-18T10:02:24Z

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: dulek, mdbooth, stephenfin

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

The pull request process is described here

Details

Needs approval from an approver in each of these files:

~~OWNERS~~ [dulek,mdbooth,stephenfin]

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

mandre · 2024-01-18T10:09:31Z

/rename No-JIRA: CARRY: Restore OWNERS to upstream

mandre · 2024-01-18T10:10:49Z

/jira refresh

openshift-ci-robot · 2024-01-18T10:10:53Z

@mandre: No Jira issue is referenced in the title of this pull request.
To reference a jira issue, add 'XYZ-NNN:' to the title of this pull request and request another refresh with /jira refresh.

Details

In response to this:

/jira refresh

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.

mandre · 2024-01-18T10:11:27Z

/rename NO-JIRA: CARRY: Restore OWNERS to upstream

mandre · 2024-01-18T10:11:58Z

/retitle NO-JIRA: CARRY: Restore OWNERS to upstream

openshift-ci-robot · 2024-01-18T10:12:19Z

@dulek: This pull request explicitly references no jira issue.

Details

In response to this:

We are now using DOWNSTREAM_OWNERS instead. We can restore OWNERS and OWNERS_ALIASES to upstream to avoid future merge conflicts.

/hold

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.

mdbooth · 2024-01-18T10:16:13Z

/verify-owners
/hold cancel

mandre · 2024-01-18T10:16:24Z

/hold

mandre · 2024-01-18T10:16:50Z

this requires openshift/release#44277

mdbooth · 2024-01-18T10:17:43Z

this requires openshift/release#44277

We can still remove the hold because verify-owners won't pass until it merges.

openshift-ci · 2024-01-18T10:22:43Z

The following users are mentioned in OWNERS file(s) but are untrusted for the following reasons. One way to make the user trusted is to add them as members of the openshift org. You can then trigger verification by writing /verify-owners in a comment.

jichenjc
- User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
- OWNERS
kayrus
- User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
- OWNERS
zetaab
- User is not a member of the org. User is not a collaborator. Satisfy at least one of these conditions to make the user trusted.
- OWNERS

dulek · 2024-02-06T16:02:37Z

/hold cancel
/verify-owners

dulek · 2024-02-06T16:04:10Z

/verify-owners

mandre · 2024-02-06T16:05:55Z

I'm about to rebase master on top of upstream release-1.29 and I've included this change already.
/hold

mandre · 2024-02-09T17:38:30Z

No longer needed after the rebase
/close

openshift-merge-robot · 2024-02-09T17:38:41Z

PR needs rebase.

Details

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/test-infra repository.

openshift-ci · 2024-02-09T17:40:59Z

@mandre: Closed this PR.

Details

In response to this:

No longer needed after the rebase
/close

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/test-infra repository.

mdbooth and others added 30 commits June 17, 2021 10:05

Revert "[All] Update docker image tag to v1.21.0 (kubernetes#1505)"

95fd33f

This reverts commit 68be840. This release-specific commit should not be on master.

Merge pull request kubernetes#57 from openshift-bot/art-consistency-o…

5b6a60a

…penshift-4.9-ose-openstack-cinder-csi-driver Updating ose-openstack-cinder-csi-driver images to be consistent with ART

Merge pull request kubernetes#59 from shiftstack/upstream-merge

04ef276

Upstream merge

Merge https://github.com/kubernetes/cloud-provider-openstack:master i…

837ba7b

…nto master

Updating and vendoring go modules after an upstream merge

ebf3405

Merge pull request kubernetes#60 from shiftstack/merge-bot-master

ce3bfd0

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

Merge https://github.com/kubernetes/cloud-provider-openstack:master i…

4b75c53

…nto master

Merge pull request kubernetes#63 from shiftstack/merge-bot-master

b28ab96

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

Merge https://github.com/kubernetes/cloud-provider-openstack:master i…

7fbc6b5

…nto master

Merge pull request kubernetes#64 from shiftstack/merge-bot-master

484da2c

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

Fix ART build

9b17766

imagebuilder used by OSBS/brew to create the product images does not handle slashes in `COPY` commands well. See e.g. openshift/imagebuilder#139. This commit ensures the tree is actually present in the container.

Merge pull request kubernetes#65 from joepvd/fix-art-build

fb8bb12

Fix ART build

Updating ose-openstack-cloud-controller-manager images to be consiste…

a97cc68

…nt with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/6fd8165c0ed89e08ff4603311951ca7521e547cd/images/ose-openstack-cloud-controller-manager.yml

Merge pull request kubernetes#66 from openshift-bot/art-consistency-o…

b6a59eb

…penshift-4.9-ose-openstack-cloud-controller-manager Updating ose-openstack-cloud-controller-manager images to be consistent with ART

Merge https://github.com/kubernetes/cloud-provider-openstack:master i…

d1367f5

…nto master

Merge pull request kubernetes#67 from shiftstack/merge-bot-master

80fedbf

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

Merge https://github.com/kubernetes/cloud-provider-openstack:master i…

aa497b8

…nto master

Merge pull request kubernetes#68 from shiftstack/merge-bot-master

bc9f510

Merge https://github.com/kubernetes/cloud-provider-openstack:master into master

Merge pull request kubernetes#55 from Fedosin/remove_me

2bec53f

Remove Fedosin from Owners

Harmonise Go to v1.16 and OCP to v4.9

1c87cc9

Remove unused Dockerfiles

e029ed4

Use the same pattern across all Dockerfiles and remove duplicates. Also remove the dockerfile for the deprecated Manila provisioner, for which the image is not used any more in 4.9.

Merge pull request kubernetes#73 from shiftstack/bump_images

7194ed1

Bug 1996783: Bump to Go v1.16 and OCP v4.9

Bug 1996783: Bump Go to v1.16 - fixup

bbe59a2

The file named `.ci-operator.yaml` governs which image is used in the OpenShift CI. This has to be updated as well.

Merge pull request kubernetes#74 from shiftstack/bump_images_fixup

2d20773

Bug 1996783: Bump Go to v1.16 - fixup

Merge upstream up to tag 'v1.22'

b93c6fa

Merge pull request kubernetes#70 from shiftstack/bump_1.22

a6492bc

Bug 1996031: Merge upstream tag 'v1.22.0'

Merge pull request kubernetes#72 from jsafrane/4.9-xfs-uuid

ddbc0e4

Bug 1988374: UPSTREAM: 1988374: Disable uuid checks on XFS (kubernetes#1614)

UPSTREAM: <carry>: Updating ose-openstack-cloud-controller-manager im…

eb7ce77

…ages to be consistent with ART Reconciling with https://github.com/openshift/ocp-build-data/tree/44bc7dde7a1abf6a25bf16d7d05e98599a9783e1/images/ose-openstack-cloud-controller-manager.yml

Merge pull request kubernetes#76 from openshift-bot/art-consistency-o…

6c3c7e3

…penshift-4.10-ose-openstack-cloud-controller-manager Updating ose-openstack-cloud-controller-manager images to be consistent with ART

openshift-ci bot assigned mdbooth Jan 18, 2024

openshift-ci bot added the lgtm Indicates that a PR is ready to be merged. label Jan 18, 2024

openshift-ci bot changed the title ~~CARRY: Restore OWNERS to upstream~~ NO-JIRA: CARRY: Restore OWNERS to upstream Jan 18, 2024

openshift-ci-robot added the jira/valid-reference Indicates that this PR references a valid Jira ticket of any type. label Jan 18, 2024

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 18, 2024

openshift-ci bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 18, 2024

openshift-ci bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Feb 6, 2024

openshift-ci bot added do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. and removed do-not-merge/invalid-owners-file Indicates that a PR should not merge because it has an invalid OWNERS file in it. labels Feb 6, 2024

mandre force-pushed the master branch from 663972f to 3e22e21 Compare February 9, 2024 17:29

openshift-merge-robot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Feb 9, 2024

openshift-ci bot closed this Feb 9, 2024

NO-JIRA: CARRY: Restore OWNERS to upstream #224

NO-JIRA: CARRY: Restore OWNERS to upstream #224

Uh oh!

Conversation

dulek commented Oct 12, 2023

Uh oh!

openshift-ci bot commented Jan 18, 2024

Uh oh!

mandre commented Jan 18, 2024

Uh oh!

mandre commented Jan 18, 2024

Uh oh!

openshift-ci-robot commented Jan 18, 2024

Uh oh!

mandre commented Jan 18, 2024

Uh oh!

mandre commented Jan 18, 2024

Uh oh!

openshift-ci-robot commented Jan 18, 2024

Uh oh!

mdbooth commented Jan 18, 2024

Uh oh!

mandre commented Jan 18, 2024

Uh oh!

mandre commented Jan 18, 2024

Uh oh!

mdbooth commented Jan 18, 2024

Uh oh!

openshift-ci bot commented Jan 18, 2024

Uh oh!

dulek commented Feb 6, 2024

Uh oh!

dulek commented Feb 6, 2024

Uh oh!

mandre commented Feb 6, 2024

Uh oh!

mandre commented Feb 9, 2024

Uh oh!

openshift-merge-robot commented Feb 9, 2024

Uh oh!

openshift-ci bot commented Feb 9, 2024

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

13 participants