Skip to content

chore(ci): fix k8s validate comment job logic #17841

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

Merged
neuronull merged 11 commits into from
Jul 6, 2023
Merged

chore(ci): fix k8s validate comment job logic #17841

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
2bdd2bb
chore(ci): fix k8s validate comment job logic
neuronull Jul 3, 2023
42e3e5c
changes needs the prior logic still
neuronull Jul 3, 2023
2b22af2
don't validate comments for non-PRs
neuronull Jul 3, 2023
94c0710
feedback ds
neuronull Jul 5, 2023
0c0504e
feedback- move to comment trigger parent workflow
neuronull Jul 5, 2023
4635a9a
fix logic in matrix
neuronull Jul 5, 2023
6534a61
feedback ds
neuronull Jul 6, 2023
2d2f2eb
Merge branch 'master' into neuronull/ci_fix_k8s_validate_comment
neuronull Jul 6, 2023
92144d1
fix job name
neuronull Jul 6, 2023
e7b8624
need to use explicit expression syntax
neuronull Jul 6, 2023
57e23d7
can't use canclled/failure only in the matrix job
neuronull Jul 6, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 10 additions & 11 deletions .github/workflows/k8s_e2e.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,15 +45,13 @@ jobs:
validate:
Comment thread
neuronull marked this conversation as resolved.
Outdated
name: Validate comment
runs-on: ubuntu-latest
if: |
github.event_name != 'issue_comment' ||
( github.event.issue.pull_request &&
( contains(github.event.comment.body, '/ci-run-all') ||
contains(github.event.comment.body, '/ci-run-k8s')
)
)
steps:
- name: Get PR comment author
if: |
github.event_name == 'issue_comment' && github.event.issue.pull_request &&
( contains(github.event.comment.body, '/ci-run-all') ||
contains(github.event.comment.body, '/ci-run-k8s')
)
id: comment
uses: tspascoal/get-user-teams-membership@v2
with:
Expand All @@ -67,6 +65,8 @@ jobs:

changes:
needs: validate
if: github.event_name != 'issue_comment' || (github.event.issue.pull_request &&
(contains(github.event.comment.body, '/ci-run-k8s') || contains(github.event.comment.body, '/ci-run-all')))
uses: ./.github/workflows/changes.yml
with:
base_ref: ${{ github.event.pull_request.base.ref }}
Expand All @@ -76,7 +76,7 @@ jobs:
build-x86_64-unknown-linux-gnu:
name: Build - x86_64-unknown-linux-gnu
runs-on: [linux, ubuntu-20.04-4core]
needs: [changes, validate]
needs: changes
if: github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true'
# cargo-deb requires a release build, but we don't need optimizations for tests
env:
Expand Down Expand Up @@ -141,7 +141,7 @@ jobs:
compute-k8s-test-plan:
name: Compute K8s test plan
runs-on: ubuntu-latest
needs: [changes, validate]
needs: changes
if: github.event_name != 'pull_request' || needs.changes.outputs.k8s == 'true'
outputs:
matrix: ${{ steps.set-matrix.outputs.matrix }}
Expand Down Expand Up @@ -195,7 +195,6 @@ jobs:
name: K8s ${{ matrix.kubernetes_version.version }} / ${{ matrix.container_runtime }} (${{ matrix.kubernetes_version.role }})
runs-on: [linux, ubuntu-20.04-4core]
needs:
- validate
- build-x86_64-unknown-linux-gnu
- compute-k8s-test-plan
strategy:
Expand Down Expand Up @@ -246,7 +245,7 @@ jobs:
final-result:
name: K8s E2E Suite
runs-on: ubuntu-latest
needs: [test-e2e-kubernetes, validate]
needs: test-e2e-kubernetes
if: |
always() && (github.event_name != 'issue_comment' || (github.event.issue.pull_request
&& (contains(github.event.comment.body, '/ci-run-k8s') || contains(github.event.comment.body, '/ci-run-all'))))
Expand Down