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

[release-v0.41.x] fix CI for LTS release #6213

Merged
merged 5 commits into from
Feb 23, 2023
Merged

[release-v0.41.x] fix CI for LTS release #6213

merged 5 commits into from
Feb 23, 2023

Conversation

pritidesai
Copy link
Member

@pritidesai pritidesai commented Feb 23, 2023 •
edited
Loading

Changes

In PR #6201, we identified a failure with our CI system. Beta integrations tests are failing in PR #6201. Our CI system has been updated to run beta tests but the code base in release-v0.41.x was not updated with necessary changes to run beta tests successfully. We discovered a list of PRs which needs to be cherry picked into release-0.41.x branch for the tests to work.

Cherry picking the following PRs:

Go build was failing after cherry-picking these PRs:

/home/prow/go/src/github.com/tektoncd/pipeline is out of date. Please run hack/update-codegen.sh.

This PR has these commits along with the changes from ./hack/update-codegen.sh.

/kind misc

Submitter Checklist

As the author of this PR, please check off the items in this checklist:

  • Has Docs included if any changes are user facing
  • Has Tests included if any functionality added or changed
  • Follows the commit message standard
  • Meets the Tekton contributor standards (including
    functionality, content, code)
  • Has a kind label. You can add one by adding a comment on this PR that contains /kind <type>. Valid types are bug, cleanup, design, documentation, feature, flake, misc, question, tep
  • Release notes block below has been updated with any user facing changes (API changes, bug fixes, changes requiring upgrade notices or deprecation warnings)
  • Release notes contains the string "action required" if the change requires additional action from users switching to the new release

Release Notes

Fixing Tekton CI for release-v0.41.x

@JeromeJu @pritidesai
Add kind cluster option
093ddbd 
This commit adds the SKIP_INITIALIZE condition which provides upgrade test
with a local kind cluster to run against.
@JeromeJu @pritidesai
Change to unfixed upgrade test release version
079a0a3 
This commit changes the previous fixed release version input to fetching the
latest release version.
@JeromeJu @pritidesai
Add prow env for beta integration test
fa5dc19
@tekton-robot tekton-robot added release-note Denotes a PR that will be considered when it comes time to generate release notes. kind/misc Categorizes issue or PR as a miscellaneuous one. labels Feb 23, 2023
@tekton-robot tekton-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Feb 23, 2023
@tekton-robot tekton-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 23, 2023
@chitrangpatel @pritidesai
Beta Example Tests
ab15be5 
This PR runs example tests of beta and stable features under the feature flag
`enable-api-fields: beta`. This is an extension to PR
tektoncd#5737.
@tekton-robot tekton-robot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Feb 23, 2023
@pritidesai pritidesai mentioned this pull request Feb 23, 2023
Merged
7 tasks
@pritidesai
Copy link
Member Author

all tests are successful except build 😞

@pritidesai
Copy link
Member Author

/test pull-tekton-pipeline-build-tests

@pritidesai
Copy link
Member Author

build is failing for such whitespace difference 905ab36#diff-3f510508862df8900929bb0330c1bff4eae3555261a4b30b5cb0546f152d2c00L8 :(

@vdemeester
Copy link
Member

/approve

@tekton-robot
Copy link
Collaborator

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: vdemeester

The full list of commands accepted by this bot can be found here.

The pull request process is described here

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

@tekton-robot tekton-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Feb 23, 2023
@lbernick
Copy link
Member

build is failing for such whitespace difference 905ab36#diff-3f510508862df8900929bb0330c1bff4eae3555261a4b30b5cb0546f152d2c00L8 :(

@pritidesai what go version are you using? this should be fixed now (#5771)

@pritidesai
Copy link
Member Author

build is failing for such whitespace difference 905ab36#diff-3f510508862df8900929bb0330c1bff4eae3555261a4b30b5cb0546f152d2c00L8 :(

@pritidesai what go version are you using? this should be fixed now (#5771)

thanks @lbernick, my go version is:

go version
go version go1.18.1 darwin/amd64

I am noticing the change in the whitespace which was introduced in 0.44 in PR #5928. Do you think I need to cherrypick this PR as well? 🙃

@pritidesai
Copy link
Member Author

Do we require a specific version of Go such that update-codegen.sh generates valid resources? @Yongxuanzhang I noticed you recently updated some of the whitespaces which might be needed for the build in this PR. What go version are you using?

@lbernick
Copy link
Member

Hm I'm not sure if you need to cherrypick that PR but you might need to re-run update-codegen with go 1.19. I'm a bit confused because @abayer recently made it so that the go version for linting would be the same one defined in the pipelines repo (rather than the ci job in the plumbing repo) in #5944

@pritidesai
Copy link
Member Author

Hm I'm not sure if you need to cherrypick that PR but you might need to re-run update-codegen with go 1.19. I'm a bit confused because @abayer recently made it so that the go version for linting would be the same one defined in the pipelines repo (rather than the ci job in the plumbing repo) in #5944

thanks @lbernick not sure why #5944 is not effective here?

I have been asking new contributors (@EmmaMunley and @pavanstarmanwar) to go by the version in go.mod. But looks like our CI is upgraded to run with 1.19. I think its time we upgrade our go.mod to 1.19, thoughts? Knative is still 1.18 if it at all plays any role here.

@lbernick
Copy link
Member

Go 1.18 is past its EOL so I think it makes sense to upgrade.

@Yongxuanzhang
Copy link
Member

Do we require a specific version of Go such that update-codegen.sh generates valid resources? @Yongxuanzhang I noticed you recently updated some of the whitespaces which might be needed for the build in this PR. What go version are you using?

I'm using 1.20, I think if the version is >=1.19 it should be ok

@pritidesai
codegen using Go 1.19
33ce154 
The golang linting was upgraded in our CI to accomodate gofmt changes in Go
1.19.

Please refer to the related PRs/issues:

tektoncd#5944
tektoncd#5771

Signed-off-by: pritidesai <pdesai@us.ibm.com>
@tekton-robot tekton-robot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Feb 23, 2023
@pritidesai
Copy link
Member Author

🎉 finally all tests succeed now 🎉

Looking for lgtm please , thanks! 🙏

@Yongxuanzhang
Copy link
Member

/lgtm
Thanks!

@tekton-robot tekton-robot added the lgtm Indicates that a PR is ready to be merged. label Feb 23, 2023
@tekton-robot tekton-robot merged commit cf7cffd into tektoncd:release-v0.41.x Feb 23, 2023
@pritidesai pritidesai deleted the fix-ci-for-lts branch February 23, 2023 18:37
@pritidesai
Copy link
Member Author

This PR fixes the beta integration failures in a branch. The same fix is needed in release-v0.42 to fix the failure discovered in this dependency update PR - #6202

/cherry-pick release-v0.42.x

@pritidesai pritidesai added the needs-cherry-pick Indicates a PR needs to be cherry-pick to a release branch label Feb 23, 2023
@tekton-robot
Copy link
Collaborator

@pritidesai: #6213 failed to apply on top of branch "release-v0.42.x":

Applying: Add kind cluster option
Using index info to reconstruct a base tree...
M	test/README.md
M	test/e2e-tests-upgrade.sh
Falling back to patching base and 3-way merge...
Auto-merging test/e2e-tests-upgrade.sh
Auto-merging test/README.md
CONFLICT (content): Merge conflict in test/README.md
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Add kind cluster option
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:

This PR fixes the beta integration failures in a branch. The same fix is needed in release-v0.42 to fix the failure discovered in this dependency update PR - #6202

/cherry-pick release-v0.42.x

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.

@pritidesai pritidesai mentioned this pull request Feb 23, 2023
Closed
6 tasks
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@bobcatfish bobcatfish Awaiting requested review from bobcatfish

@dibyom dibyom Awaiting requested review from dibyom

Assignees

@Yongxuanzhang Yongxuanzhang

Labels
approved Indicates a PR has been approved by an approver from all required OWNERS files. kind/misc Categorizes issue or PR as a miscellaneuous one. lgtm Indicates that a PR is ready to be merged. needs-cherry-pick Indicates a PR needs to be cherry-pick to a release branch release-note Denotes a PR that will be considered when it comes time to generate release notes. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
7 participants
@pritidesai @vdemeester @tekton-robot @lbernick @Yongxuanzhang @JeromeJu @chitrangpatel