Closed tuminoid closed 3 months ago
OK, dev-env fix is in, let's see if we can merge this.
/test metal3-ubuntu-e2e-integration-test-main metal3-centos-e2e-integration-test-main
/cc @kashifest @Rozzii /retitle remove KUBECTL_SHA256 passthru /unhold
Good to merge.
/retitle :seedling: remove KUBECTL_SHA256 passthru
[APPROVALNOTIFIER] This PR is APPROVED
This pull-request has been approved by: kashifest
The full list of commands accepted by this bot can be found here.
The pull request process is described here
/lgtm
/cherry-pick release-1.7
@tuminoid: once the present PR merges, I will cherry-pick it on top of release-1.7 in a new PR and assign it to you.
@tuminoid: #1822 failed to apply on top of branch "release-1.7":
Applying: remove KUBECTL_SHA256 passthru
Using index info to reconstruct a base tree...
M scripts/ci-e2e.sh
M scripts/environment.sh
Falling back to patching base and 3-way merge...
Auto-merging scripts/environment.sh
CONFLICT (content): Merge conflict in scripts/environment.sh
Auto-merging scripts/ci-e2e.sh
CONFLICT (content): Merge conflict in scripts/ci-e2e.sh
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 remove KUBECTL_SHA256 passthru
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".
We no longer need to pass-thru KUBECTL_SHA256 as we download it and verify it from the downloaded checksum.
This depends on https://github.com/metal3-io/metal3-dev-env/pull/1437 merging first. /hold