-
Notifications
You must be signed in to change notification settings - Fork 913
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
ci: reduce redundancy by using matrix strategy on Windows and Linux workflows #3514
ci: reduce redundancy by using matrix strategy on Windows and Linux workflows #3514
Conversation
Signed-off-by: Julian Labatut <[email protected]>
container: | ||
image: docker://opensearchstaging/ci-runner:ci-runner-rockylinux8-opensearch-dashboards-integtest-v2 | ||
options: --user 1001 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
@kavilla do we still need this custom image? or can we just use the default ubuntu-latest
image now?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
we shouldn't now that we use the script to find the version but i am worried about a few weeks from now when Node 14 is EoLed and chromedriver drops it.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
+1 I don't think we necessarily have to use a custom image besides the time when the chromedriver isn't releasing a new version for chrome when github updates their virtual environments or as @AMoo-Miki mentioned.
i'm fine with this. One other benefit of using a custom image but since the github user 1001
isn't added to the image is that if that if we add the user to have access the dependencies the image can already have all the setup dependencies step in it. Like the image has yarn and java.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks great; thanks.
Signed-off-by: Julian Labatut <[email protected]>
This is really awesome! I really appreciate @jlabatut. I'm going to let the most recent push run and will add more feedback. I also think we can consider taking this one step further as these don't really need to be gathered in the same file. |
@kavilla What jobs precisely should be split into different workflows ? |
@jlabatut can you rebase and push to the branch again? The CI workflows did not run on your latest changes. |
…orkflows (opensearch-project#3514) Signed-off-by: Julian Labatut <[email protected]>
Signed-off-by: Julian Labatut <[email protected]>
Signed-off-by: Julian Labatut <[email protected]>
e2ca7a9
to
52cd717
Compare
Codecov Report
📣 This organization is not using Codecov’s GitHub App Integration. We recommend you install it so Codecov can continue to function properly for your repositories. Learn more @@ Coverage Diff @@
## main #3514 +/- ##
==========================================
+ Coverage 66.40% 66.45% +0.04%
==========================================
Files 3205 3205
Lines 61562 61563 +1
Branches 9497 9497
==========================================
+ Hits 40882 40911 +29
+ Misses 18404 18380 -24
+ Partials 2276 2272 -4
Flags with carried forward coverage won't be shown. Click here to find out more.
Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here. |
Signed-off-by: Julian Labatut <[email protected]>
Anyone would know why the integration tests (job |
I think Rocky pushed a PR that should fix the outdated |
I think as is it's already a huge improvement and I appreciate it. But then we can take it to the next step like this: https://github.com/opensearch-project/opensearch-dashboards-functional-test/blob/main/.github/workflows/release-e2e-workflow-template.yml. Like what I'd imagine is the summary would split, the template will have the main stuff. We probably don't need conditionals as we can pass parameters to execute, but the conditionals are fine for now. Then we have a file for Linux and a file for Windows. That way in the future it's even more maintainable. This is already really great as is. But would you like to take that as a follow-up @jlabatut? Please let me know if you have any questions. Thank you! |
@kavilla, I would be glad to do this improvement, but wouldn't it be better/faster if this PR is merged, and I create a new issue and/or PR for this ? I'll work on this as soon as you answer 🙂 |
Done! Thank you so much! |
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-2.x 2.x
# Navigate to the new working tree
pushd ../.worktrees/backport-2.x
# Create a new branch
git switch --create backport/backport-3514-to-2.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1e127b0a52925ee51d185798f00362d8eb59d2ce
# Push it to GitHub
git push --set-upstream origin backport/backport-3514-to-2.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-2.x Then, create a pull request where the |
…rch-project#3514) * ci: reduce redundancy by using matrix strategy on Windows and Linux workflows (opensearch-project#3514) * update CHANGELOG.md (opensearch-project#3514) * ci: fix overriding matrix for Linux x86 (opensearch-project#3514) * ci: update os checks in preparation for darwin (opensearch-project#3514) Signed-off-by: Julian Labatut <[email protected]> Co-authored-by: Miki <[email protected]>
…rch-project#3514) * ci: reduce redundancy by using matrix strategy on Windows and Linux workflows (opensearch-project#3514) * update CHANGELOG.md (opensearch-project#3514) * ci: fix overriding matrix for Linux x86 (opensearch-project#3514) * ci: update os checks in preparation for darwin (opensearch-project#3514) Signed-off-by: Julian Labatut <[email protected]> Co-authored-by: Miki <[email protected]> Co-authored-by: Kawika Avilla <[email protected]>
The backport to
To backport manually, run these commands in your terminal: # Fetch latest updates from GitHub
git fetch
# Create a new working tree
git worktree add ../.worktrees/backport-1.x 1.x
# Navigate to the new working tree
pushd ../.worktrees/backport-1.x
# Create a new branch
git switch --create backport/backport-3514-to-1.x
# Cherry-pick the merged commit of this pull request and resolve the conflicts
git cherry-pick -x --mainline 1 1e127b0a52925ee51d185798f00362d8eb59d2ce
# Push it to GitHub
git push --set-upstream origin backport/backport-3514-to-1.x
# Go back to the original working tree
popd
# Delete the working tree
git worktree remove ../.worktrees/backport-1.x Then, create a pull request where the |
…3609) * ci: reduce redundancy by using matrix strategy on Windows and Linux workflows (#3514) * update CHANGELOG.md (#3514) * ci: fix overriding matrix for Linux x86 (#3514) * ci: update os checks in preparation for darwin (#3514) Signed-off-by: Julian Labatut <[email protected]> Co-authored-by: Julian Labatut <[email protected]> Co-authored-by: Miki <[email protected]>
…rch-project#3514) * ci: reduce redundancy by using matrix strategy on Windows and Linux workflows (opensearch-project#3514) * update CHANGELOG.md (opensearch-project#3514) * ci: fix overriding matrix for Linux x86 (opensearch-project#3514) * ci: update os checks in preparation for darwin (opensearch-project#3514) Signed-off-by: Julian Labatut <[email protected]> Co-authored-by: Miki <[email protected]> Signed-off-by: David Sinclair <[email protected]>
…rch-project#3514) * ci: reduce redundancy by using matrix strategy on Windows and Linux workflows (opensearch-project#3514) * update CHANGELOG.md (opensearch-project#3514) * ci: fix overriding matrix for Linux x86 (opensearch-project#3514) * ci: update os checks in preparation for darwin (opensearch-project#3514) Signed-off-by: Julian Labatut <[email protected]> Co-authored-by: Miki <[email protected]> Signed-off-by: David Sinclair <[email protected]>
@kavilla I'm relabeling for 1.3.11, as this was never backported to 1.x |
…rch-project#3514) * ci: reduce redundancy by using matrix strategy on Windows and Linux workflows (opensearch-project#3514) * update CHANGELOG.md (opensearch-project#3514) * ci: fix overriding matrix for Linux x86 (opensearch-project#3514) * ci: update os checks in preparation for darwin (opensearch-project#3514) Signed-off-by: Julian Labatut <[email protected]> Co-authored-by: Miki <[email protected]> (cherry picked from commit 1e127b0)
We won't be backporting this to the 1.3 line. |
Description
This PR aims to reduce the amount of redundancy in the CI "build & test" workflow by using matrices, instead of duplicating jobs for both Windows and Linux.
Issues Resolved
Closes #2991
Check List