status-im
/
consul
mirror of https://github.com/status-im/consul.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge pull request #9853 from hashicorp/dnephin/fix-ci-nomad-integ 

ci: update config for nomad main branch rename
This commit is contained in:
Daniel Nephin 2021-03-09 15:28:51 -05:00 committed by hashicorp-ci
parent f0b9dc7175
commit a0d47afb93
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.circleci/config.yml
View File

@ -452,13 +452,13 @@ jobs:
path: *TEST_RESULTS_DIR path: *TEST_RESULTS_DIR
# run integration tests on nomad/master # run integration tests on nomad/master
nomad-integration-master: nomad-integration-main:
docker: docker:
- image: *GOLANG_IMAGE - image: *GOLANG_IMAGE
environment: environment:
<<: *ENVIRONMENT <<: *ENVIRONMENT
NOMAD_WORKING_DIR: /go/src/github.com/hashicorp/nomad NOMAD_WORKING_DIR: /go/src/github.com/hashicorp/nomad
NOMAD_VERSION: master NOMAD_VERSION: main
steps: *NOMAD_INTEGRATION_TEST_STEPS steps: *NOMAD_INTEGRATION_TEST_STEPS
build-website-docker-image: build-website-docker-image:
@ -834,7 +834,7 @@ workflows:
- dev-upload-docker: - dev-upload-docker:
<<: *dev-upload <<: *dev-upload
context: consul-ci context: consul-ci
- nomad-integration-master: - nomad-integration-main:
requires: requires:
- dev-build - dev-build
- nomad-integration-0_8: - nomad-integration-0_8: