Skip to content

[build] Switch to golang 1.18 in Dockerfile.ci#1247

Merged
openshift-merge-robot merged 1 commit into
openshift:masterfrom
aravindhp:dockerfile-ci-go-1.18
Sep 12, 2022
Merged

[build] Switch to golang 1.18 in Dockerfile.ci#1247
openshift-merge-robot merged 1 commit into
openshift:masterfrom
aravindhp:dockerfile-ci-go-1.18

Conversation

@aravindhp
Copy link
Copy Markdown
Contributor

@aravindhp aravindhp commented Sep 12, 2022

This was missed in #1075. registry.ci.openshift.org/openshift/release:golang-1.18 comes with jq pre-installed and we no longer need to install it.

@openshift-ci openshift-ci Bot added the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 12, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 12, 2022

Skipping CI for Draft Pull Request.
If you want CI signal for your change, please convert it to an actual PR.
You can still manually trigger a test run with /test all

@aravindhp
Copy link
Copy Markdown
Contributor Author

/test images

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2022
This was missed in openshift#1075.
registry.ci.openshift.org/openshift/release:golang-1.18 comes with jq
pre-installed and we no longer need to install it.
@aravindhp aravindhp force-pushed the dockerfile-ci-go-1.18 branch from ee6edd0 to c9001d3 Compare September 12, 2022 18:33
@aravindhp
Copy link
Copy Markdown
Contributor Author

/approve cancel

@openshift-ci openshift-ci Bot removed the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2022
@aravindhp
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown

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

Details

In response to this:

/cherry-pick release-4.11

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.

@aravindhp
Copy link
Copy Markdown
Contributor Author

/cherry-pick community-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown

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

Details

In response to this:

/cherry-pick community-4.11

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.

@aravindhp
Copy link
Copy Markdown
Contributor Author

/test images

@jrvaldes
Copy link
Copy Markdown
Contributor

/lgtm

@openshift-ci openshift-ci Bot added the lgtm Indicates that a PR is ready to be merged. label Sep 12, 2022
@sebsoto
Copy link
Copy Markdown
Contributor

sebsoto commented Sep 12, 2022

/approve

@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 12, 2022

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: sebsoto

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:

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

@openshift-ci openshift-ci Bot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 12, 2022
@aravindhp aravindhp marked this pull request as ready for review September 12, 2022 20:15
@openshift-ci openshift-ci Bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label Sep 12, 2022
@openshift-ci
Copy link
Copy Markdown
Contributor

openshift-ci Bot commented Sep 12, 2022

@aravindhp: all tests passed!

Full PR test history. Your PR dashboard.

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. I understand the commands that are listed here.

@openshift-merge-robot openshift-merge-robot merged commit 1a1f09b into openshift:master Sep 12, 2022
@aravindhp aravindhp deleted the dockerfile-ci-go-1.18 branch September 12, 2022 23:55
@aravindhp
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown

@aravindhp: #1247 failed to apply on top of branch "release-4.11":

Applying: Switch to golang 1.18 in Dockerfile.ci
Using index info to reconstruct a base tree...
M	build/Dockerfile.ci
Falling back to patching base and 3-way merge...
Auto-merging build/Dockerfile.ci
CONFLICT (content): Merge conflict in build/Dockerfile.ci
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Switch to golang 1.18 in Dockerfile.ci
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".

Details

In response to this:

/cherry-pick release-4.11

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.

@aravindhp
Copy link
Copy Markdown
Contributor Author

/cherry-pick community-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown

@aravindhp: #1247 failed to apply on top of branch "community-4.11":

Applying: Switch to golang 1.18 in Dockerfile.ci
Using index info to reconstruct a base tree...
M	build/Dockerfile.ci
Falling back to patching base and 3-way merge...
Auto-merging build/Dockerfile.ci
CONFLICT (content): Merge conflict in build/Dockerfile.ci
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Switch to golang 1.18 in Dockerfile.ci
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".

Details

In response to this:

/cherry-pick community-4.11

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.

@aravindhp
Copy link
Copy Markdown
Contributor Author

@aravindhp: #1247 failed to apply on top of branch "release-4.11":

Applying: Switch to golang 1.18 in Dockerfile.ci
Using index info to reconstruct a base tree...
M	build/Dockerfile.ci
Falling back to patching base and 3-way merge...
Auto-merging build/Dockerfile.ci
CONFLICT (content): Merge conflict in build/Dockerfile.ci
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Switch to golang 1.18 in Dockerfile.ci
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".

Waiting on #1243 🤞🏽

@aravindhp
Copy link
Copy Markdown
Contributor Author

aravindhp commented Sep 13, 2022

@aravindhp: #1247 failed to apply on top of branch "community-4.11":

Waiting on #1249

@aravindhp
Copy link
Copy Markdown
Contributor Author

/cherry-pick community-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown

@aravindhp: new pull request created: #1250

Details

In response to this:

/cherry-pick community-4.11

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.

@aravindhp
Copy link
Copy Markdown
Contributor Author

/cherry-pick release-4.11

@openshift-cherrypick-robot
Copy link
Copy Markdown

@aravindhp: new pull request created: #1255

Details

In response to this:

/cherry-pick release-4.11

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

approved Indicates a PR has been approved by an approver from all required OWNERS files. lgtm Indicates that a PR is ready to be merged.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants