From 1786277b5fe79b80859408aa946c165eefa2a0c7 Mon Sep 17 00:00:00 2001 From: Daniel Nephin Date: Tue, 9 Mar 2021 15:28:51 -0500 Subject: [PATCH] Merge pull request #9853 from hashicorp/dnephin/fix-ci-nomad-integ ci: update config for nomad main branch rename --- .circleci/config.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index cea3210b25..938ecdbc1f 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -510,13 +510,13 @@ jobs: - run: *notify-slack-failure # run integration tests on nomad/master - nomad-integration-master: + nomad-integration-main: docker: - image: *GOLANG_IMAGE environment: <<: *ENVIRONMENT NOMAD_WORKING_DIR: /go/src/github.com/hashicorp/nomad - NOMAD_VERSION: master + NOMAD_VERSION: main steps: *NOMAD_INTEGRATION_TEST_STEPS build-website-docker-image: @@ -939,7 +939,7 @@ workflows: - dev-upload-docker: <<: *dev-upload context: consul-ci - - nomad-integration-master: + - nomad-integration-main: requires: - dev-build - nomad-integration-0_8: