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.

Sign up for GitHub

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

Jump to bottom

chore: Fix an automatic rebase against the upstream #280

Merged
merged 1 commit into from
Oct 5, 2023
Merged

chore: Fix an automatic rebase against the upstream #280

merged 1 commit into from
Oct 5, 2023

Conversation

RomanNikitenko
Copy link
Contributor

What does this PR do?

Fix an automatic rebase against the upstream

What issues does this PR fix?

eclipse-che/che#22577

How to test this PR?

jobs should be happy

@github-actions
Copy link

github-actions bot commented Oct 3, 2023 •
edited
Loading

Click here to review and test in web IDE: Contribute

@RomanNikitenko RomanNikitenko force-pushed the fix-rebase branch 2 times, most recently from 8892325 to dc3c116 Compare October 3, 2023 14:38
@github-actions
Copy link

github-actions bot commented Oct 3, 2023

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-280-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-280-dev-amd64

2 similar comments
@github-actions
Copy link

github-actions bot commented Oct 3, 2023

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-280-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-280-dev-amd64

@github-actions
Copy link

github-actions bot commented Oct 3, 2023

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-280-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-280-dev-amd64

@RomanNikitenko RomanNikitenko marked this pull request as ready for review October 3, 2023 16:31
azatsarynnyy
azatsarynnyy approved these changes Oct 4, 2023
View reviewed changes
Copy link
Member

@azatsarynnyy azatsarynnyy left a comment

Choose a reason for hiding this comment

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

Thank you Roman for looking at it!

@RomanNikitenko
Copy link
Contributor Author

RomanNikitenko commented Oct 4, 2023 •
edited
Loading

@azatsarynnyy
thank you for the reviewing it!

I've found another problem:

image

So, I'm not able to merge my changes as is:

image

I'll have to:

  • resolve that problem first
  • update my current PR
  • ask you again for the review

@RomanNikitenko
chore: Rebase against the upstream "4aaab19f69780f0a8bf48a9004f911ee1…
5fe0c2c 
…6444367"

Signed-off-by: Roman Nikitenko <rnikiten@redhat.com>
@github-actions
Copy link

github-actions bot commented Oct 5, 2023

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-280-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-280-dev-amd64

@RomanNikitenko
Copy link
Contributor Author

RomanNikitenko commented Oct 5, 2023 •
edited
Loading

@azatsarynnyy
I've resolved conflicts, does it still look good for you to be merged?

if so, I'm going to merge it as soon as the jobs become green.

@github-actions
Copy link

github-actions bot commented Oct 5, 2023

Pull Request images published ✨
image: quay.io/che-incubator-pull-requests/che-code:pr-280-amd64
Dev image: quay.io/che-incubator-pull-requests/che-code-dev:pr-280-dev-amd64

@azatsarynnyy
Copy link
Member

@azatsarynnyy I've resolved conflicts, does it still look good for you to be merged?

if so, I'm going to merge it as soon as the jobs become green.

Sure, @RomanNikitenko please merge once it's ready. Thx!

@RomanNikitenko RomanNikitenko merged commit 7fc4493 into che-incubator:main Oct 5, 2023
4 checks passed
@RomanNikitenko RomanNikitenko deleted the fix-rebase branch October 5, 2023 17:45
@devstudio-release
Copy link

Build 3.10 :: code_3.x/954: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: sync-to-downstream_3.x/4890: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: get-sources-rhpkg-container-build_3.x/4711: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: push-latest-container-to-quay_3.x/3454: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: get-sources-rhpkg-container-build_3.x/4711: SUCCESS

code : 3.x :: Build 55998516 : quay.io/devspaces/code-rhel8:3.10-79
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/3454 triggered

@devstudio-release
Copy link

Build 3.10 :: update-digests_3.x/4533: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: code_3.x/954: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/4890 triggered

@devstudio-release
Copy link

Build 3.10 :: operator-bundle_3.x/2132: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: sync-to-downstream_3.x/4891: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: get-sources-rhpkg-container-build_3.x/4712: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: push-latest-container-to-quay_3.x/3455: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: copyIIBsToQuay/1979: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: get-sources-rhpkg-container-build_3.x/4712: SUCCESS

devspaces-operator-bundle : 3.x :: Build 56003885 : quay.io/devspaces/devspaces-operator-bundle:3.10-109
SUCCESS; copied to quay; /DS_CI/push-latest-container-to-quay_3.x/3455 triggered;
Bundle CSV related images:
- quay.io/devspaces/code-rhel8:3.10-79
- quay.io/devspaces/configbump-rhel8:3.10-12
- quay.io/devspaces/dashboard-rhel8:3.10-31
- quay.io/devspaces/devfileregistry-rhel8:3.10-59
- quay.io/devspaces/devspaces-rhel8-operator:3.10-12
- quay.io/devspaces/idea-rhel8:3.10-4
- quay.io/devspaces/pluginregistry-rhel8:3.10-13
- quay.io/devspaces/server-rhel8:3.10-15
- quay.io/devspaces/traefik-rhel8:3.10-6
- quay.io/devspaces/udi-rhel8:3.10-12
= registry.redhat.io/openshift4/ose-kube-rbac-proxy:v4.12.0-202309181625.p0.g94f3fde.assembly.stream
= registry.redhat.io/openshift4/ose-oauth-proxy:v4.12.0-202309181625.p0.g03e5b13.assembly.stream
= registry.redhat.io/rhscl/mongodb-36-rhel7:1-50
= registry.redhat.io/ubi8/ubi-minimal:8.8-1072

@devstudio-release
Copy link

Build 3.10 :: sync-to-downstream_3.x/4891: SUCCESS

Build container: devspaces-operator-bundle synced; /DS_CI/get-sources-rhpkg-container-build_3.x/4712 triggered; /job/DS_CI/job/dsc_3.x triggered;

@devstudio-release
Copy link

Build 3.10 :: operator-bundle_3.x/2132: SUCCESS

Upstream sync done; /DS_CI/sync-to-downstream_3.x/4891 triggered

@devstudio-release
Copy link

Build 3.10 :: dsc_3.x/1451: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.10 :: update-digests_3.x/4533: SUCCESS

Detected new images: rebuild operator-bundle
* code; /DS_CI/operator-bundle_3.x/2132 triggered

@devstudio-release
Copy link

Build 3.10 :: dsc_3.x/1451: SUCCESS

3.10.0-CI

@devstudio-release
Copy link

Build 3.10 :: copyIIBsToQuay/1979: SUCCESS

3.10
arches = x86_64, s390x, ppc64le;
  * LATEST DS OPERATOR BUNDLE = <a href=https://quay.io/repository/devspaces/devspaces-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devspaces-operator-bundle:3.10-109
  * LATEST DWO OPERATOR BUNDLE = <a href=https://quay.io/repository/devworkspace/devworkspace-operator-bundle?tab=tags>registry-proxy.engineering.redhat.com/rh-osbs/devworkspace-operator-bundle:0.21-7
+ ppc64le-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.10-v4.14-589686-533291-ppc64le
  + quay.io/devspaces/iib:3.10-v4.14-ppc64le
  + quay.io/devspaces/iib:next-v4.14-ppc64le
  + quay.io/devspaces/iib:3.10-v4.13-589610-533286-ppc64le
  + quay.io/devspaces/iib:3.10-v4.13-ppc64le
  + quay.io/devspaces/iib:next-v4.13-ppc64le
  + quay.io/devspaces/iib:3.10-v4.12-590150-533281-ppc64le
  + quay.io/devspaces/iib:3.10-v4.12-ppc64le
  + quay.io/devspaces/iib:next-v4.12-ppc64le
  + quay.io/devspaces/iib:3.10-v4.11-590139-533277-ppc64le
  + quay.io/devspaces/iib:3.10-v4.11-ppc64le
  + quay.io/devspaces/iib:next-v4.11-ppc64le
+ s390x-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.10-v4.14-589686-533291-s390x
  + quay.io/devspaces/iib:3.10-v4.14-s390x
  + quay.io/devspaces/iib:next-v4.14-s390x
  + quay.io/devspaces/iib:3.10-v4.13-589610-533286-s390x
  + quay.io/devspaces/iib:3.10-v4.13-s390x
  + quay.io/devspaces/iib:next-v4.13-s390x
  + quay.io/devspaces/iib:3.10-v4.12-590150-533281-s390x
  + quay.io/devspaces/iib:3.10-v4.12-s390x
  + quay.io/devspaces/iib:next-v4.12-s390x
  + quay.io/devspaces/iib:3.10-v4.11-590139-533277-s390x
  + quay.io/devspaces/iib:3.10-v4.11-s390x
  + quay.io/devspaces/iib:next-v4.11-s390x
+ x86_64-rhel8 IIB(s) copied:
  + quay.io/devspaces/iib:3.10-v4.14-589686-533291-x86_64
  + quay.io/devspaces/iib:3.10-v4.14-x86_64
  + quay.io/devspaces/iib:next-v4.14-x86_64
  + quay.io/devspaces/iib:3.10-v4.13-590162-533286-x86_64
  + quay.io/devspaces/iib:3.10-v4.13-x86_64
  + quay.io/devspaces/iib:next-v4.13-x86_64
  + quay.io/devspaces/iib:3.10-v4.12-590150-533281-x86_64
  + quay.io/devspaces/iib:3.10-v4.12-x86_64
  + quay.io/devspaces/iib:next-v4.12-x86_64
  + quay.io/devspaces/iib:3.10-v4.11-590139-533277-x86_64
  + quay.io/devspaces/iib:3.10-v4.11-x86_64
  + quay.io/devspaces/iib:next-v4.11-x86_64

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@azatsarynnyy azatsarynnyy azatsarynnyy approved these changes

@vitaliy-guliy vitaliy-guliy Awaiting requested review from vitaliy-guliy vitaliy-guliy is a code owner

@l0rd l0rd Awaiting requested review from l0rd

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
3 participants
@RomanNikitenko @azatsarynnyy @devstudio-release