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

Reuse workflow CI #10826

Merged
merged 2 commits into from
Jan 13, 2024
Merged

Reuse workflow CI #10826

merged 2 commits into from
Jan 13, 2024

Conversation

rikatz
Copy link
Contributor

@rikatz rikatz commented Jan 7, 2024

What this PR does / why we need it:

We've been repeating some parts of CI A LOT. Instead, we can reuse some workflow parts (like e2e tests) and keep it simple when we want to change something on this workflow

Copy link

netlify bot commented Jan 7, 2024

Deploy Preview for kubernetes-ingress-nginx canceled.

Name Link
🔨 Latest commit 388fc74
🔍 Latest deploy log https://app.netlify.com/sites/kubernetes-ingress-nginx/deploys/65a16e039bef8c00086acdb8

@k8s-ci-robot k8s-ci-robot added cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. labels Jan 7, 2024
@k8s-ci-robot
Copy link
Contributor

This issue is currently awaiting triage.

If Ingress contributors determines this is a relevant issue, they will accept it by applying the triage/accepted label and provide further guidance.

The triage/accepted label can be added by org members by writing /triage accepted in a comment.

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.

@k8s-ci-robot k8s-ci-robot added needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 7, 2024
@k8s-ci-robot
Copy link
Contributor

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: rikatz

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

@k8s-ci-robot k8s-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Jan 7, 2024
@rikatz rikatz force-pushed the reuse-ci-workflows branch 7 times, most recently from f85ffc3 to 6903694 Compare January 7, 2024 21:56
@rikatz
Copy link
Contributor Author

rikatz commented Jan 7, 2024

/hold

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 7, 2024
@rikatz rikatz force-pushed the reuse-ci-workflows branch 6 times, most recently from 3f30b81 to b3fa15c Compare January 7, 2024 22:33
@rikatz
Copy link
Contributor Author

rikatz commented Jan 7, 2024

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 7, 2024
@rikatz
Copy link
Contributor Author

rikatz commented Jan 7, 2024

/hold

I will add image building and push here as well

@k8s-ci-robot k8s-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 7, 2024
@rikatz rikatz force-pushed the reuse-ci-workflows branch 3 times, most recently from fd9bcf9 to 08c4c50 Compare January 7, 2024 23:48
@@ -86,7 +88,7 @@ jobs:
runs-on: ubuntu-latest
needs: changes
if: |
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true') || ${{ inputs.run_e2e }}
(needs.changes.outputs.go == 'true') || (needs.changes.outputs.charts == 'true')
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The inputs.run_e2e is used to manually run the e2e test workflow. If we remove this condition, not all steps will be executed.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

it was triggering the test for anything. I would say that maybe for e2e just on those corner case, people can do a stupid change on .go files :)

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i use it for testing and would like to keep it, when CI is broken on branches its nice to be able to just run github action e2e.

@k8s-ci-robot k8s-ci-robot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Jan 11, 2024
@rikatz rikatz force-pushed the reuse-ci-workflows branch 8 times, most recently from ede38ec to fc72ca2 Compare January 12, 2024 13:33
@rikatz
Copy link
Contributor Author

rikatz commented Jan 12, 2024

/hold cancel

@k8s-ci-robot k8s-ci-robot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Jan 12, 2024
images/Makefile Outdated Show resolved Hide resolved
@@ -1,17 +0,0 @@
timeout: 1200s
options:
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

i thought we were keeping the cloudbuilds and adding the GHA functionality?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have removed just from this image, as it is a bit borked and the name from it is different from folder, etc etc

@rikatz rikatz force-pushed the reuse-ci-workflows branch 2 times, most recently from a2797fe to 8cbbeba Compare January 12, 2024 16:50
@rikatz rikatz added the lgtm "Looks good to me", indicates that a PR is ready to be merged. label Jan 13, 2024
@k8s-ci-robot k8s-ci-robot merged commit c9a3571 into kubernetes:main Jan 13, 2024
41 checks passed
@strongjz
Copy link
Member

/cherry-pick release-1.9

@k8s-infra-cherrypick-robot
Copy link
Contributor

@strongjz: #10826 failed to apply on top of branch "release-1.9":

Applying: Reuse workflow CI
.git/rebase-apply/patch:453: trailing whitespace.
 
.git/rebase-apply/patch:601: new blank line at EOF.
+
.git/rebase-apply/patch:665: new blank line at EOF.
+
warning: 3 lines add whitespace errors.
Using index info to reconstruct a base tree...
M	.github/workflows/ci.yaml
M	images/cfssl/rootfs/Dockerfile
Falling back to patching base and 3-way merge...
Auto-merging images/cfssl/rootfs/Dockerfile
CONFLICT (content): Merge conflict in images/cfssl/rootfs/Dockerfile
Auto-merging .github/workflows/ci.yaml
CONFLICT (content): Merge conflict in .github/workflows/ci.yaml
error: Failed to merge in the changes.
hint: Use 'git am --show-current-patch=diff' to see the failed patch
Patch failed at 0001 Reuse workflow 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".

In response to this:

/cherry-pick release-1.9

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. cncf-cla: yes Indicates the PR's author has signed the CNCF CLA. lgtm "Looks good to me", indicates that a PR is ready to be merged. needs-kind Indicates a PR lacks a `kind/foo` label and requires one. needs-priority needs-triage Indicates an issue or PR lacks a `triage/foo` label and requires one. size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants