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

Add commands for alignment che-code with upstream #427

Merged
merged 1 commit into from
Oct 8, 2024

Conversation

RomanNikitenko
Copy link
Contributor

@RomanNikitenko RomanNikitenko commented Oct 8, 2024

What does this PR do?

Add commands to the devfile to help with alignment che-code with upstream

What issues does this PR fix?

eclipse-che/che#22578

How to test this PR?

  1. Start a workspace with che-code
  2. Terminal => Run Task => devfile => Install git-subtree
  3. Terminal => Run Task => devfile => Add remote for upstream
  4. Terminal => Run Task => devfile => Fetch upstream changes

As result you can get the following state:

  • che-code is up to date with upstream
    or
  • there are conflicts that should be resolved manually

Both states are expected - as it's depends on the current state of che-code and vscode repos.

Does this PR contain changes that override default upstream Code-OSS behavior?

  • the PR contains changes in the code folder (you can skip it if your changes are placed in a che extension )
  • the corresponding items were added to the CHANGELOG.md file
  • rules for automatic git rebase were added to the .rebase folder

Signed-off-by: RomanNikitenko <rnikiten@redhat.com>
Copy link

github-actions bot commented Oct 8, 2024

Click here to review and test in web IDE: Contribute

Copy link

github-actions bot commented Oct 8, 2024

@RomanNikitenko RomanNikitenko merged commit e978619 into main Oct 8, 2024
7 checks passed
@RomanNikitenko RomanNikitenko deleted the commnds-for-alignment-with-upstream branch October 8, 2024 12:46
@devstudio-release
Copy link

Build 3.18 :: code_3.x/1478: Console, Changes, Git Data

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

Build 3.18 :: code_3.x/1478: SUCCESS

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

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

@devstudio-release
Copy link

Build 3.18 :: copyIIBsToQuay/2833: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.18 :: sync-to-downstream_3.x/7794: SUCCESS

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

@devstudio-release
Copy link

Build 3.18 :: operator-bundle_3.x/3655: SUCCESS

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

@devstudio-release
Copy link

Build 3.18 :: update-digests_3.x/7720: SUCCESS

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

@devstudio-release
Copy link

Build 3.18 :: dsc_3.x/2015: Console, Changes, Git Data

@devstudio-release
Copy link

Build 3.18 :: dsc_3.x/2015: SUCCESS

3.18.0-CI

@devstudio-release
Copy link

Build 3.18 :: copyIIBsToQuay/2833: SUCCESS

3.18
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.18-6
  * 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:???
+ x86_64-rhel8 IIB(s) copied:
  + <a href=https://quay.io/devspaces/iib:3.18-v4.17-833504- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64>quay.io/devspaces/iib:3.18-v4.17-833504- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64
  + quay.io/devspaces/iib:3.18-v4.17-x86_64
  + <a href=https://quay.io/devspaces/iib:3.18-v4.16-833503- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64>quay.io/devspaces/iib:3.18-v4.16-833503- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64
  + quay.io/devspaces/iib:3.18-v4.16-x86_64
  + <a href=https://quay.io/devspaces/iib:3.18-v4.15-833502- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64>quay.io/devspaces/iib:3.18-v4.15-833502- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64
  + quay.io/devspaces/iib:3.18-v4.15-x86_64
  + <a href=https://quay.io/devspaces/iib:3.18-v4.14-833501- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64>quay.io/devspaces/iib:3.18-v4.14-833501- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64
  + quay.io/devspaces/iib:3.18-v4.14-x86_64
  + <a href=https://quay.io/devspaces/iib:3.18-v4.13-833500- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64>quay.io/devspaces/iib:3.18-v4.13-833500- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64
  + quay.io/devspaces/iib:3.18-v4.13-x86_64
  + <a href=https://quay.io/devspaces/iib:3.18-v4.12-833499- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64>quay.io/devspaces/iib:3.18-v4.12-833499- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-x86_64
  + quay.io/devspaces/iib:3.18-v4.12-x86_64
  * 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:???
+ s390x-rhel8 IIB(s) copied:
  + <a href=https://quay.io/devspaces/iib:3.18-v4.17-833504- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x>quay.io/devspaces/iib:3.18-v4.17-833504- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x
  + quay.io/devspaces/iib:3.18-v4.17-s390x
  + <a href=https://quay.io/devspaces/iib:3.18-v4.16-833503- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x>quay.io/devspaces/iib:3.18-v4.16-833503- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x
  + quay.io/devspaces/iib:3.18-v4.16-s390x
  + <a href=https://quay.io/devspaces/iib:3.18-v4.15-833502- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x>quay.io/devspaces/iib:3.18-v4.15-833502- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x
  + quay.io/devspaces/iib:3.18-v4.15-s390x
  + <a href=https://quay.io/devspaces/iib:3.18-v4.14-833501- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x>quay.io/devspaces/iib:3.18-v4.14-833501- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x
  + quay.io/devspaces/iib:3.18-v4.14-s390x
  + <a href=https://quay.io/devspaces/iib:3.18-v4.13-833500- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x>quay.io/devspaces/iib:3.18-v4.13-833500- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x
  + quay.io/devspaces/iib:3.18-v4.13-s390x
  + <a href=https://quay.io/devspaces/iib:3.18-v4.12-833499- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x>quay.io/devspaces/iib:3.18-v4.12-833499- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-s390x
  + quay.io/devspaces/iib:3.18-v4.12-s390x
+ ppc64le-rhel8 IIB(s) copied:
  + <a href=https://quay.io/devspaces/iib:3.18-v4.17-833504- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le>quay.io/devspaces/iib:3.18-v4.17-833504- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le
  + quay.io/devspaces/iib:3.18-v4.17-ppc64le
  + <a href=https://quay.io/devspaces/iib:3.18-v4.16-833503- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le>quay.io/devspaces/iib:3.18-v4.16-833503- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le
  + quay.io/devspaces/iib:3.18-v4.16-ppc64le
  + <a href=https://quay.io/devspaces/iib:3.18-v4.15-833502- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le>quay.io/devspaces/iib:3.18-v4.15-833502- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le
  + quay.io/devspaces/iib:3.18-v4.15-ppc64le
  + <a href=https://quay.io/devspaces/iib:3.18-v4.14-833501- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le>quay.io/devspaces/iib:3.18-v4.14-833501- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le
  + quay.io/devspaces/iib:3.18-v4.14-ppc64le
  + <a href=https://quay.io/devspaces/iib:3.18-v4.13-833500- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le>quay.io/devspaces/iib:3.18-v4.13-833500- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le
  + quay.io/devspaces/iib:3.18-v4.13-ppc64le
  + <a href=https://quay.io/devspaces/iib:3.18-v4.12-833499- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le>quay.io/devspaces/iib:3.18-v4.12-833499- /tmp/getIIBsForBundle.sh -t PROD_VER [OPTIONS]-ppc64le
  + quay.io/devspaces/iib:3.18-v4.12-ppc64le

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants