Skip to content

test(e2e): configurable tmp dir locally #25780

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
Merged
agaudreault merged 39 commits into from
Jan 6, 2026
Merged

test(e2e): configurable tmp dir locally #25780

agaudreault merged 39 commits into from
Jan 6, 2026

Conversation

@agaudreault
Copy link
Member

@agaudreault agaudreault commented Dec 22, 2025 •
edited
Loading

When running the e2e on MacOS,

  • the /tmp/argo-e2e folder could not be mounted as write in docker when using Rancher. Making it configurable allow to use another tmp directory without the need to give rancher / docker desktop the permissions globally.
  • Add makefile option to disable the E2E rerun locally (default to 5 so CI is not affected, but should be swapped later)
  • Add --force-conflicts to e2e resource so make start-e2e-local does not conflict between runs.
  • Support restart of the e2e container (start-git.sh) by copying ssh keys and known host so they are not generated when sshd starts

Part of #24307

Stacked on top of #25864
Blocks #25724

@agaudreault agaudreault requested review from a team as code owners December 22, 2025 18:15
@bunnyshell
Copy link

bunnyshell bot commented Dec 22, 2025 •
edited
Loading

❌ Preview Environment deleted from Bunnyshell

Available commands (reply to this comment):

  • 🚀 /bns:deploy to deploy the environment

@agaudreault agaudreault requested a review from a team as a code owner December 22, 2025 19:29
@agaudreault agaudreault marked this pull request as draft December 22, 2025 19:31
@agaudreault agaudreault changed the title test(e2e): configurable tmp dir and new certs for MacOS test(e2e): configurable tmp dir locally Jan 5, 2026
agaudreault and others added 24 commits January 5, 2026 17:31
@agaudreault
update certs so they are valid when running locally on mac
a8cba96 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
disable rerun locally
2716801 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix /tmp/argo-e2e data so it is configurable
adb6162 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
ssh handshake issue
ea9013e 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix when tls changes causing conflicts
ff95ae5 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
update cert CN hardcoded in test
8aaddb1 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix CI using wrong known_host
5d150ff 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
docs
37a3dc0 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix appset e2e failing
7c161de 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
add back env vars?
6e6396e 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
Revert "add back env vars?"
4c8bd12 
This reverts commit 4aaceb3.

Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
revert back to tmp mounting to validate CI
96afbe3 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
fix namespace name
615b260 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump renovatebot/github-action from 44.2.0 to 44.2.1 (ar…
f561e08 
…goproj#25781)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@pasha-codefresh @agaudreault
chore(deps): update notifications-engine to v0.5.1-0.20251223091026-8…
0a871ee 
…c0c96d8d530 (argoproj#25785)

Co-authored-by: pasha <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump google.golang.org/grpc from 1.77.0 to 1.78.0 (argop…
1ffd484 
…roj#25789)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@reggie-k @agaudreault
chore(deps): bump ubuntu in gh actions to 24.04 and ubuntu in test/re…
7b37b9a 
…mote/Dockerfile to 25.10 (argoproj#25763)

Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@1Shubham7 @agaudreault
docs: Update Linux host IP detection in Toolchain guide - to avoid ha…
f1a9fb1 
…rdcoded `eth0` (argoproj#25800)

Signed-off-by: shubham singh mahar <[email protected]>
Co-authored-by: shubham singh mahar <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@github-actions @agaudreault
[Bot] docs: Update Snyk report (argoproj#25806)
9dadbd3 
Signed-off-by: CI <[email protected]>
Co-authored-by: CI <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@jsoref @agaudreault
docs: link to source hydrator (argoproj#25813)
d9e33d8 
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump library/golang from 36b4f45 to 31c1e53 in /test…
1939be0 
…/remote (argoproj#25829)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@argoproj-renovate @agaudreault
chore(deps): update docker.io/library/golang:1.25.5 docker digest to 9…
297a0d8 
…7be073 (argoproj#25820)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump renovatebot/github-action from 44.2.1 to 44.2.2 (ar…
75a2340 
…goproj#25818)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump the otel group with 4 updates (argoproj#25553)
6f7f5e7 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
argoproj-renovate bot and others added 13 commits January 5, 2026 17:31
@argoproj-renovate @agaudreault
chore(deps): update docker.io/library/golang:1.25.5 docker digest to …
067b9b0 
…31c1e53 (argoproj#25831)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump qs from 6.11.0 to 6.14.1 in /ui (argoproj#25828)
af8b80e 
Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@argoproj-renovate @agaudreault
chore(deps): update docker.io/library/golang:1.25.5 docker digest to …
9b402bb 
…6cc2338 (argoproj#25838)

Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@github-actions @agaudreault
[Bot] docs: Update Snyk report (argoproj#25843)
0f3a51e 
Signed-off-by: CI <[email protected]>
Co-authored-by: CI <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@zeraye @agaudreault
docs: fix help-wanted label link (argoproj#25839)
68069bb 
Signed-off-by: Jakub Rudnik <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@dependabot @agaudreault
chore(deps): bump library/golang from 31c1e53 to 6cc2338 in /test…
88b05b0 
…/remote (argoproj#25847)

Signed-off-by: dependabot[bot] <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@ioleksiuk @agaudreault
docs: fix typos in documentation (argoproj#25844)
6fca87a 
Signed-off-by: ioleksiuk <[email protected]>
Signed-off-by: Illia Oleksiuk <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@jsoref @agaudreault
fix(ui): remove excess dot (argoproj#25816)
d4f8b2e 
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@ayia-hosni @nitishfy @agaudreault
chore: migrate k8s.gcr.io to registry.k8s.io in install manifests (ar…
9cbbd18 
…goproj#25802)

Signed-off-by: Aya <[email protected]>
Co-authored-by: Nitish Kumar <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@reggie-k @agaudreault
ci: test against k8s 1.34.2 (argoproj#25856)
e4badea 
Signed-off-by: reggie-k <[email protected]>
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
test(e2e): unstable CMP e2e test when running locally (argoproj#25752)
d8b1c4d 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
duh
c4ea2ae 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault
always mount tmp
e5457f3 
Signed-off-by: Alexandre Gaudreault <[email protected]>
@agaudreault agaudreault marked this pull request as ready for review January 5, 2026 22:35
@agaudreault agaudreault added the ready-for-review An approver should give a final review and merge the PR label Jan 5, 2026
@github-project-automation github-project-automation bot moved this to Ready for final review in Argo CD Review Jan 5, 2026
@agaudreault agaudreault enabled auto-merge (squash) January 6, 2026 20:20
@agaudreault agaudreault merged commit b0e4e84 into argoproj:master Jan 6, 2026
27 checks passed
@github-project-automation github-project-automation bot moved this from Ready for final review to Done in Argo CD Review Jan 6, 2026
vishwagandhi1610 pushed a commit to vishwagandhi1610/argo-cd that referenced this pull request Jan 7, 2026
@agaudreault @dependabot
@pasha-codefresh @reggie-k @1Shubham7 @github-actions @jsoref @argoproj-renovate @zeraye @ioleksiuk @ayia-hosni @nitishfy @vishwagandhi1610
test(e2e): configurable tmp dir locally (argoproj#25780)
7869921 
Signed-off-by: Alexandre Gaudreault <[email protected]>
Signed-off-by: dependabot[bot] <[email protected]>
Signed-off-by: reggie-k <[email protected]>
Signed-off-by: shubham singh mahar <[email protected]>
Signed-off-by: CI <[email protected]>
Signed-off-by: Josh Soref <[email protected]>
Signed-off-by: renovate[bot] <renovate[bot]@users.noreply.github.com>
Signed-off-by: Jakub Rudnik <[email protected]>
Signed-off-by: ioleksiuk <[email protected]>
Signed-off-by: Illia Oleksiuk <[email protected]>
Signed-off-by: Aya <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Pasha Kostohrys <[email protected]>
Co-authored-by: pasha <[email protected]>
Co-authored-by: Regina Voloshin <[email protected]>
Co-authored-by: Shubham Singh <[email protected]>
Co-authored-by: shubham singh mahar <[email protected]>
Co-authored-by: github-actions[bot] <41898282+github-actions[bot]@users.noreply.github.com>
Co-authored-by: CI <[email protected]>
Co-authored-by: Josh Soref <[email protected]>
Co-authored-by: argoproj-renovate[bot] <161757507+argoproj-renovate[bot]@users.noreply.github.com>
Co-authored-by: Jakub Rudnik <[email protected]>
Co-authored-by: Illia Oleksiuk <[email protected]>
Co-authored-by: Aya Hosni <[email protected]>
Co-authored-by: Nitish Kumar <[email protected]>
Signed-off-by: Vishwa Gandhi <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@crenshaw-dev crenshaw-dev crenshaw-dev approved these changes

Assignees

No one assigned

Labels

ready-for-review An approver should give a final review and merge the PR

Projects

Argo CD Review
Archived in project

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

9 participants

@agaudreault @crenshaw-dev @pasha-codefresh @reggie-k @1Shubham7 @jsoref @zeraye @ioleksiuk @ayia-hosni