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

[openshift-4.9] ose-console: Get rid of distgit lookaside cache #1638

Merged
merged 1 commit into from
May 26, 2022

Conversation

vfreex
Copy link
Contributor

@vfreex vfreex commented May 26, 2022

Using distgit lookaside cache will not be allowed in the new source container workflow.

This PR:

  • Uses OSBS fetch-artifacts-url.yaml to instruct OSBS to download the binaries from the internal web server during build.
  • Uses Cachito to provide npm dependencies.

Requires openshift/console#11519

Using distgit lookaside cache will not be allowed in the new source container workflow.

This PR:
- Uses OSBS fetch-artifacts-url.yaml to instruct OSBS to download the binaries from the internal web server during build.
- Uses Cachito to provide npm dependencies.
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2022

@vfreex: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

ose-console: Get rid of distgit lookaside cache

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.

@vfreex vfreex changed the title ose-console: Get rid of distgit lookaside cache [openshift-4.9] ose-console: Get rid of distgit lookaside cache May 26, 2022
@openshift-ci
Copy link
Contributor

openshift-ci bot commented May 26, 2022

@vfreex: No Bugzilla bug is referenced in the title of this pull request.
To reference a bug, add 'Bug XXX:' to the title of this pull request and request another bug refresh with /bugzilla refresh.

In response to this:

[openshift-4.9] ose-console: Get rid of distgit lookaside cache

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.

@vfreex
Copy link
Contributor Author

vfreex commented May 26, 2022

/cherry-pick openshift-4.8
/cherry-pick openshift-4.7

@openshift-cherrypick-robot

@vfreex: once the present PR merges, I will cherry-pick it on top of openshift-4.8 in a new PR and assign it to you.

In response to this:

/cherry-pick openshift-4.8
/cherry-pick openshift-4.7

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-cherrypick-robot

@vfreex: new pull request created: #1640

In response to this:

/cherry-pick openshift-4.8
/cherry-pick openshift-4.7

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-cherrypick-robot

@vfreex: #1638 failed to apply on top of branch "openshift-4.7":

Applying: ose-console: Get rid of distgit lookaside cache
Using index info to reconstruct a base tree...
M	images/openshift-enterprise-console.yml
M	modifications/update-console-sources
Falling back to patching base and 3-way merge...
CONFLICT (modify/delete): modifications/update-console-sources deleted in ose-console: Get rid of distgit lookaside cache and modified in HEAD. Version HEAD of modifications/update-console-sources left in tree.
Auto-merging images/openshift-enterprise-console.yml
CONFLICT (content): Merge conflict in images/openshift-enterprise-console.yml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 ose-console: Get rid of distgit lookaside cache
When you have resolved this problem, run "git am --continue".
If you prefer to skip this patch, run "git am --skip" instead.
To restore the original branch and stop patching, run "git am --abort".

In response to this:

/cherry-pick openshift-4.8
/cherry-pick openshift-4.7

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.

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.

None yet

2 participants