Merge pull request #1429 from gruntwork-io/fix-circle-ci

Fix CircleCi Helm Test
gruntwork-io · Aug 5, 2024 · 91e02fb · 91e02fb
2 parents 9ffe143 + 988a7a4
commit 91e02fb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 6 deletions.
diff --git a/examples/terraform-aws-lambda-example/src/README.md b/examples/terraform-aws-lambda-example/src/README.md
@@ -3,5 +3,6 @@
 The lambda executable `handler` was built using
 
 ``` shell
-go build bootstrap.go
+go get github.com/aws/aws-lambda-go/lambda
+GOOS=linux GOARCH=amd64 go build -tags lambda.norpc -o bootstrap .
 ```
diff --git a/examples/terraform-aws-lambda-example/src/bootstrap b/examples/terraform-aws-lambda-example/src/bootstrap
diff --git a/modules/retry/retry_test.go b/modules/retry/retry_test.go
@@ -115,19 +115,20 @@ func TestDoWithTimeout(t *testing.T) {
 func TestDoInBackgroundUntilStopped(t *testing.T) {
 	t.Parallel()
 
-	sleepBetweenRetries := 5 * time.Second
+	sleepBetweenRetries := 2 * time.Second
+	waitStop := sleepBetweenRetries*2 + sleepBetweenRetries/2
 	counter := 0
 
 	stop := DoInBackgroundUntilStopped(t, t.Name(), sleepBetweenRetries, func() {
 		counter++
+		t.Log(time.Now(), counter)
 	})
 
-	time.Sleep(sleepBetweenRetries * 3)
+	time.Sleep(waitStop)
 	stop.Done()
-
 	assert.Equal(t, 3, counter)
 
-	time.Sleep(sleepBetweenRetries * 3)
+	time.Sleep(waitStop)
 	assert.Equal(t, 3, counter)
 }
 

diff --git a/test/helm_keda_remote_example_template_snapshot_test.go b/test/helm_keda_remote_example_template_snapshot_test.go
@@ -173,5 +173,5 @@ func TestHelmKedaRemoteExampleTemplateRenderedPackageDiff(t *testing.T) {
 	output := helm.RenderRemoteTemplate(t, options, "https://kedacore.github.io/charts", releaseName, []string{})
 
 	// run the diff and assert the number of diffs matches the number of diffs in the snapshot
-	require.Equal(t, 18, helm.DiffAgainstSnapshot(t, options, output, releaseName))
+	require.Equal(t, 24, helm.DiffAgainstSnapshot(t, options, output, releaseName))
 }