Skip to content

Commit ded4754

Browse files
committed
minor updates
1 parent 17e7412 commit ded4754

File tree

6 files changed

+15
-9
lines changed

6 files changed

+15
-9
lines changed

.gitignore

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,12 @@ website/resources/
1212
website/node_modules/
1313
website/tech-doc-hugo
1414

15+
# samples bin
16+
testdata/go/memcached-operator/bin/*
17+
18+
# Trash files
19+
*\.DS_Store
20+
1521
# Created by https://www.toptal.com/developers/gitignore/api/go,vim,emacs,visualstudiocode
1622
# Edit at https://www.toptal.com/developers/gitignore?templates=go,vim,emacs,visualstudiocode
1723

Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
SHELL := /bin/bash
1+
SHELL = /bin/bash
22

33
# Build-time variables to inject into binaries
44
export SIMPLE_VERSION=$(shell (test "$(shell git describe)" = "$(shell git describe --abbrev=0)" && echo $(shell git describe)) || echo $(shell git describe --abbrev=0)+git)

release/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ release: check_tag goreleaser ## Release all operator-sdk binaries with notes. $
3232

3333
.PHONY: goreleaser
3434
goreleaser: ## Install goreleaser locally.
35-
@[ ! -f ./bin/goreleaser ] && curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh || true
35+
@[[ -f ./bin/goreleaser ]] || curl -sfL https://install.goreleaser.com/github.com/goreleaser/goreleaser.sh | sh
3636

3737
IMAGE_TARGET_LIST = operator-sdk helm-operator ansible-operator scorecard-test scorecard-test-kuttl custom-scorecard-tests
3838
image-push: $(foreach i,$(IMAGE_TARGET_LIST),image-push/$(i)) ## Push all images for the host architecture.

test/e2e-ansible/e2e_ansible_scorecard_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var _ = Describe("Testing Ansible Projects with Scorecard", func() {
4040
runScorecardCmd := exec.Command(tc.BinaryName, "scorecard", "bundle",
4141
"--selector=suite=basic",
4242
"--output=json",
43-
"--wait-time=2m")
43+
"--wait-time=40s")
4444
scorecardOutputBytes, err := tc.Run(runScorecardCmd)
4545
Expect(err).NotTo(HaveOccurred())
4646
err = json.Unmarshal(scorecardOutputBytes, &scorecardOutput)
@@ -52,7 +52,7 @@ var _ = Describe("Testing Ansible Projects with Scorecard", func() {
5252
runOLMScorecardCmd := exec.Command(tc.BinaryName, "scorecard", "bundle",
5353
"--selector=suite=olm",
5454
"--output=json",
55-
"--wait-time=2m")
55+
"--wait-time=40s")
5656
scorecardOutputBytes, err = tc.Run(runOLMScorecardCmd)
5757
Expect(err).To(HaveOccurred())
5858
err = json.Unmarshal(scorecardOutputBytes, &scorecardOutput)

test/e2e-go/e2e_go_scorecard_test.go

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ var _ = Describe("Testing Go Projects with Scorecard", func() {
4040
runScorecardCmd := exec.Command(tc.BinaryName, "scorecard", "bundle",
4141
"--selector=suite=basic",
4242
"--output=json",
43-
"--wait-time=2m")
43+
"--wait-time=40s")
4444
scorecardOutputBytes, err := tc.Run(runScorecardCmd)
4545
Expect(err).NotTo(HaveOccurred())
4646
err = json.Unmarshal(scorecardOutputBytes, &scorecardOutput)
@@ -52,7 +52,7 @@ var _ = Describe("Testing Go Projects with Scorecard", func() {
5252
runScorecardCmd = exec.Command(tc.BinaryName, "scorecard", "bundle",
5353
"--selector=suite=custom",
5454
"--output=json",
55-
"--wait-time=2m")
55+
"--wait-time=40s")
5656
scorecardOutputBytes, err = tc.Run(runScorecardCmd)
5757
Expect(err).NotTo(HaveOccurred())
5858
err = json.Unmarshal(scorecardOutputBytes, &scorecardOutput)
@@ -63,7 +63,7 @@ var _ = Describe("Testing Go Projects with Scorecard", func() {
6363
runOLMScorecardCmd := exec.Command(tc.BinaryName, "scorecard", "bundle",
6464
"--selector=suite=olm",
6565
"--output=json",
66-
"--wait-time=2m")
66+
"--wait-time=40s")
6767
scorecardOutputBytes, err = tc.Run(runOLMScorecardCmd)
6868
Expect(err).To(HaveOccurred())
6969
err = json.Unmarshal(scorecardOutputBytes, &scorecardOutput)

test/e2e-helm/e2e_helm_scorecard_test.go

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ var _ = Describe("Testing Helm Projects with Scorecard", func() {
4141
runScorecardCmd := exec.Command(tc.BinaryName, "scorecard", "bundle",
4242
"--selector=suite=basic",
4343
"--output=json",
44-
"--wait-time=2m")
44+
"--wait-time=40s")
4545
scorecardOutputBytes, err := tc.Run(runScorecardCmd)
4646
Expect(err).NotTo(HaveOccurred())
4747
err = json.Unmarshal(scorecardOutputBytes, &scorecardOutput)
@@ -53,7 +53,7 @@ var _ = Describe("Testing Helm Projects with Scorecard", func() {
5353
runOLMScorecardCmd := exec.Command(tc.BinaryName, "scorecard", "bundle",
5454
"--selector=suite=olm",
5555
"--output=json",
56-
"--wait-time=2m")
56+
"--wait-time=40s")
5757
scorecardOutputBytes, err = tc.Run(runOLMScorecardCmd)
5858
Expect(err).To(HaveOccurred())
5959
err = json.Unmarshal(scorecardOutputBytes, &scorecardOutput)

0 commit comments

Comments
 (0)