Skip to content

Commit 7990ac0

Browse files
committed
Update
1 parent 7b5aac9 commit 7990ac0

File tree

3 files changed

+10
-1
lines changed

3 files changed

+10
-1
lines changed

.github/workflows/ci.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ jobs:
6969
7070
ARGO_CD_SERVER_ADDR=127.0.0.1:51212 make start-e2e &
7171
72-
OVERRIDE_APISERVER_ADDR_SOURCE="0.0.0.0" OVERRIDE_APISERVER_ADDR_DEST="kubernetes.default.svc" make test-e2e
72+
GITHUB_K3D=true OVERRIDE_APISERVER_ADDR_SOURCE="0.0.0.0" OVERRIDE_APISERVER_ADDR_DEST="kubernetes.default.svc" make test-e2e
7373
7474
make e2e-reset
7575
pkill go

tests-e2e/argocd/queryscoped_cluster_secrets_test.go

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -138,6 +138,11 @@ var _ = Describe("Argo CD Application tests", func() {
138138

139139
func(clusterScoped bool) {
140140

141+
if fixture.IsGitHubK3D() {
142+
Skip("when running on GitHub CI via K3d, we don't have an API endpoint IP we can use, so skip")
143+
return
144+
}
145+
141146
createServiceAccountsAndSecretsForTest(clusterScoped)
142147

143148
for _, userName := range users {

tests-e2e/fixture/fixture.go

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,10 @@ func GetE2ETestUserWorkspaceKubeClient() (client.Client, error) {
930930
return k8sClient, nil
931931
}
932932

933+
func IsGitHubK3D() bool {
934+
return strings.TrimSpace(strings.ToLower(os.Getenv("GITHUB_K3D"))) == "true"
935+
}
936+
933937
// IsRunningInStonesoupEnvironment returns true if the tests are running in a Stonesoup environment, false otherwise
934938
func IsRunningInStonesoupEnvironment() bool {
935939
// Stonesoup environment is bootstrapped by an AppOfApps Gitops Deployment.

0 commit comments

Comments
 (0)