Skip to content

Commit

Permalink
Attempting to fix ci pipeline (elastic#6161)
Browse files Browse the repository at this point in the history
* modifications to ci pipeline
  • Loading branch information
naemono authored Nov 9, 2022
1 parent 2c6a407 commit e8b516f
Show file tree
Hide file tree
Showing 3 changed files with 2 additions and 1 deletion.
1 change: 0 additions & 1 deletion .buildkite/pipeline.yml
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,6 @@ steps:

- label: ":go: checks"
commands:
- touch .env
- make check-license-header check-predicates shellcheck reattach-pv

- group: tests
Expand Down
1 change: 1 addition & 0 deletions .ci/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@ vault := ../hack/retry.sh 5 vault

# This is set to avoid the issue described in https://github.com/hashicorp/vault/issues/6710
VAULT_CLIENT_TIMEOUT = 120
VAULT_ROOT_PATH ?= secret/devops-ci/cloud-on-k8s

# BUILD_ID is present during run on Jenkins machine, but not on dev box, hence using it here to distinguish between those cases
ifndef VAULT_TOKEN
Expand Down
1 change: 1 addition & 0 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -186,6 +186,7 @@ manifest-gen-test:

shellcheck:
# --external-sources because .buildkite/scripts/common/get-test-artifacts.sh source .env
@[[ ! -f .env ]] && touch .env || true
shellcheck --external-sources $(shell find . -type f -name "*.sh" -not -path "./vendor/*")

upgrade-test: docker-build docker-push
Expand Down

0 comments on commit e8b516f

Please sign in to comment.