github: Fix external workloads test file syntax #17019
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
brb
added
area/CI
|
The external workloads jobs have passed. Removing the WIP commit and marking ready for the review. |
brb
force-pushed
the
pr/brb/fix-github-workflows-external
branch
from
264fbaf
to
658e8e4
Compare
pchaigno
approved these changes
Jul 30, 2021
jrajahalme
approved these changes
Jul 30, 2021
pchaigno
added
the
ready-to-merge
nbusseneau
requested changes
Jul 30, 2021
There was a problem hiding this comment.
Thanks for catching this. I forgot a git add... 🤦🏻
Can you replace your changes with the following instead? These are the correct changes. Thanks :)
From 78427044d56f0c9bc5debabf8458729da431a43a Mon Sep 17 00:00:00 2001
From: Nicolas Busseneau <nicolas@isovalent.com>
Date: Fri, 30 Jul 2021 15:52:54 +0200
Subject: [PATCH] workflows: fix external workloads 1.10 YAML
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
---
.github/workflows/conformance-externalworkloads-v1.10.yml | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/conformance-externalworkloads-v1.10.yml b/.github/workflows/conformance-externalworkloads-v1.10.yml
index fd55279a9..768a0bb99 100644
--- a/.github/workflows/conformance-externalworkloads-v1.10.yml
+++ b/.github/workflows/conformance-externalworkloads-v1.10.yml
@@ -72,8 +72,8 @@ jobs:
name: Deduce required tests from code changes
if: |
(github.event_name == 'issue_comment' && (
- (startsWith(github.event.comment.body, 'ci-external-workloads-v1.10') ||
- startsWith(github.event.comment.body, 'test-backport-1.10')) &&
+ startsWith(github.event.comment.body, 'ci-external-workloads-v1.10') ||
+ (startsWith(github.event.comment.body, 'test-backport-1.10'))
)) ||
(github.event_name == 'schedule' && github.repository == 'cilium/cilium') ||
github.event_name == 'pull_request'
@@ -112,8 +112,8 @@ jobs:
needs: check_changes
if: |
(github.event_name == 'issue_comment' && (
- startsWith(github.event.comment.body, 'ci-external-workloads') ||
- (startsWith(github.event.comment.body, 'test-me-please') && (needs.check_changes.outputs.tested == 'true'))
+ startsWith(github.event.comment.body, 'ci-external-workloads-v1.10') ||
+ (startsWith(github.event.comment.body, 'test-backport-1.10') && (needs.check_changes.outputs.tested == 'true'))
)) ||
(github.event_name == 'schedule' && github.repository == 'cilium/cilium') ||
github.event_name == 'pull_request'
--
2.32.0
| @@ -76,7 +76,7 @@ jobs: | |||
| if: | | |||
| (github.event_name == 'issue_comment' && ( | |||
| startsWith(github.event.comment.body, 'ci-external-workloads') || | |||
| (startsWith(github.event.comment.body, 'test-me-please')) | |||
There was a problem hiding this comment.
This is correct and can be left as-is (consistent with other workflows).
Comment on lines
75
to
76
| startsWith(github.event.comment.body, 'ci-external-workloads-v1.10') || | ||
| startsWith(github.event.comment.body, 'test-backport-1.10') |
There was a problem hiding this comment.
This should be:
Suggested change
| startsWith(github.event.comment.body, 'ci-external-workloads-v1.10') || | |
| startsWith(github.event.comment.body, 'test-backport-1.10') | |
| startsWith(github.event.comment.body, 'ci-external-workloads-v1.10') || | |
| (startsWith(github.event.comment.body, 'test-backport-1.10')) |
I am joining a patch with this change and another one.
There was a problem hiding this comment.
Why? Does it make a difference?
There was a problem hiding this comment.
No, it's just to be consistent with the other workflows (just like for the other comment above). The failure was indeed related to the &&, but GH suggestion shows the diff w.r.t. to the new code rather than the original one.
nbusseneau
removed
the
ready-to-merge
brb
force-pushed
the
pr/brb/fix-github-workflows-external
branch
from
658e8e4
to
724240e
Compare
|
@nbusseneau Do you approve the latest change? |
vadorovsky
approved these changes
Aug 2, 2021
|
@vadorovsky No, it is missing part of the patch, I think I was unclear sorry 😅 |
brb
force-pushed
the
pr/brb/fix-github-workflows-external
branch
from
724240e
to
dbae23e
Compare
|
@nbusseneau PTAL |
nbusseneau
requested changes
Aug 3, 2021
brb
force-pushed
the
pr/brb/fix-github-workflows-external
branch
from
dbae23e
to
28a5c80
Compare
The GH action runner reported:
The workflow is not valid.
.github/workflows/conformance-externalworkloads-v1.10.yml (Line: 73,
Col: 9): Unexpected symbol: ')'. Located at position 185 within
expression: (github.event_name == 'issue_comment' && (
(startsWith(github.event.comment.body, 'ci-external-workloads-v1.10')
||
startsWith(github.event.comment.body, 'test-backport-1.10')) &&
)) ||
(github.event_name == 'schedule' && github.repository ==
'cilium/cilium') ||
github.event_name == 'pull_request'
Fixes: 5726e9f ("workflows: add external workload conformance test")
Signed-off-by: Nicolas Busseneau <nicolas@isovalent.com>
Signed-off-by: Martynas Pumputis <m@lambda.lt>
brb
added
the
ready-to-merge
gandro
approved these changes
Aug 4, 2021
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
See commit msgs.
Fixes: 5726e9f ("workflows: add external workload conformance test")