luxolus
/
open-nomad
2
0
Fork 0
Code Issues 1 Pull Requests Packages Releases Wiki Activity

Merge pull request #6767 from hashicorp/c-ci-tweaks-20191122 

Further tweaks to CircleCI build scripts
This commit is contained in:
Mahmood Ali 2019-11-22 15:52:43 -05:00 committed by GitHub
parent 603773b22f e8dc686019
commit f819d406ff
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 109 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.circleci/.gitattributes vendored
View File

@ -1 +1 @@
config.yml linguist-generated /config.yml linguist-generated

51
.circleci/config.yml generated
View File

@ -9,11 +9,13 @@ jobs:
image: ubuntu-1604:201903-01 image: ubuntu-1604:201903-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./nomad/... - GOTEST_PKGS: ./nomad/...
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -83,11 +85,13 @@ jobs:
image: ubuntu-1604:201903-01 image: ubuntu-1604:201903-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./api/... - GOTEST_PKGS: ./api/...
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -157,11 +161,13 @@ jobs:
image: ubuntu-1604:201903-01 image: ubuntu-1604:201903-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./drivers/exec - GOTEST_PKGS: ./drivers/exec
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -231,11 +237,13 @@ jobs:
image: ubuntu-1604:201903-01 image: ubuntu-1604:201903-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./client/... - GOTEST_PKGS: ./client/...
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -305,11 +313,13 @@ jobs:
image: ubuntu-1604:201903-01 image: ubuntu-1604:201903-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./drivers/shared/executor - GOTEST_PKGS: ./drivers/shared/executor
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -414,17 +424,25 @@ jobs:
sudo rm -rf /usr/bin/protoc sudo rm -rf /usr/bin/protoc
sudo ./scripts/vagrant-linux-priv-protoc.sh sudo ./scripts/vagrant-linux-priv-protoc.sh
name: install protoc name: install protoc
- run:
command: "CCI_VERSION=\"0.1.5879\"\nCCI_SHA256=\"f178ea62c781aec06267017404f87983c87f171fd0e66ef3737916246ae66dd6\"\n\nURL=\"https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CCI_VERSION}/circleci-cli_${CCI_VERSION}_linux_amd64.tar.gz\"\n\nmkdir -p /tmp/circleci-cli/\ncurl --fail --show-error --location \\\n -o /tmp/circleci-cli/cli.tar.gz \"${URL}\"\n\necho \"$CCI_SHA256 /tmp/circleci-cli/cli.tar.gz\" | sha256sum -c\n\ntar -xz --strip-components=1 \\\n -C /tmp/circleci-cli \\\n -f /tmp/circleci-cli/cli.tar.gz \\\n \"circleci-cli_${CCI_VERSION}_linux_amd64/circleci\" \n\nsudo cp /tmp/circleci-cli/circleci /usr/bin/circleci-local-cli\n\ncircleci-local-cli version\n"
name: Install CircleCI CLI 0.1.5879
- run: - run:
command: make deps lint-deps command: make deps lint-deps
- run: - run:
command: make check command: make check
- run: - run:
command: make checkscripts command: make checkscripts
- run:
command: make -C .circleci CIRCLECI="circleci-local-cli --skip-update-check" ci-verify
name: check .circleci/config.yml is up-to-date
environment: environment:
- GIT_PAGER: cat
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /go - GOPATH: /go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
build-website: build-website:
docker: docker:
- image: hashicorp/middleman-hashicorp:0.3.35 - image: hashicorp/middleman-hashicorp:0.3.35
@ -452,11 +470,13 @@ jobs:
image: ubuntu-1604:201903-01 image: ubuntu-1604:201903-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: '' - GOTEST_PKGS: ''
- GOTEST_PKGS_EXCLUDE: ./api|./client|./drivers/docker|./drivers/exec|./drivers/rkt|./drivers/shared/executor|./nomad|./devices - GOTEST_PKGS_EXCLUDE: ./api|./client|./drivers/docker|./drivers/exec|./drivers/rkt|./drivers/shared/executor|./nomad|./devices
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -526,10 +546,12 @@ jobs:
- image: golang:1.12.13 - image: golang:1.12.13
working_directory: /go/src/github.com/hashicorp/nomad working_directory: /go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /go - GOPATH: /go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./devices/... - GOTEST_PKGS: ./devices/...
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -587,21 +609,25 @@ jobs:
- run: - run:
command: make test-website command: make test-website
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
test-docker: test-docker:
machine: machine:
image: circleci/classic:201808-01 image: circleci/classic:201808-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./drivers/docker - GOTEST_PKGS: ./drivers/docker
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: amd64 - GOTESTARCH: amd64
@ -671,10 +697,12 @@ jobs:
- image: golang:1.12.13 - image: golang:1.12.13
working_directory: /go/src/github.com/hashicorp/nomad working_directory: /go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /go - GOPATH: /go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GO_TAGS: codegen_generated - GO_TAGS: codegen_generated
steps: steps:
- checkout - checkout
@ -718,20 +746,24 @@ jobs:
- run: - run:
command: sudo -E -H -u circleci PATH=${PATH} make e2e-test command: sudo -E -H -u circleci PATH=${PATH} make e2e-test
environment: environment:
- GIT_PAGER: cat
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /go - GOPATH: /go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
test-32bit: test-32bit:
machine: machine:
image: ubuntu-1604:201903-01 image: ubuntu-1604:201903-01
working_directory: ~/go/src/github.com/hashicorp/nomad working_directory: ~/go/src/github.com/hashicorp/nomad
environment: environment:
- GIT_PAGER: cat
- GOLANG_VERSION: 1.12.13 - GOLANG_VERSION: 1.12.13
- GOMAXPROCS: 1 - GOMAXPROCS: 1
- GOPATH: /home/circleci/go - GOPATH: /home/circleci/go
- GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml - GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
- NOMAD_SLOW_TEST: 1 - NOMAD_SLOW_TEST: 1
- PAGER: cat
- GOTEST_PKGS: ./client/fingerprint - GOTEST_PKGS: ./client/fingerprint
- GOTEST_PKGS_EXCLUDE: '' - GOTEST_PKGS_EXCLUDE: ''
- GOTESTARCH: '386' - GOTESTARCH: '386'
@ -799,83 +831,100 @@ jobs:
workflows: workflows:
build-test: build-test:
jobs: jobs:
- build-binaries - build-binaries:
filters:
branches:
ignore:
- stable-website
- lint-go: - lint-go:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-client: - test-client:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-nomad: - test-nomad:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-api: - test-api:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-devices: - test-devices:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-other: - test-other:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-docker: - test-docker:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-exec: - test-exec:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-shared-exec: - test-shared-exec:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-32bit: - test-32bit:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-e2e: - test-e2e:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-ui: - test-ui:
filters: filters:
branches: branches:
ignore: ignore:
- stable-website - stable-website
- /^docs-.*/
- test-website: - test-website:
filters: filters:
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
website: website:
jobs: jobs:

31
.circleci/config/commands/install-circleci-local-cli.yml Normal file
View File

@ -0,0 +1,31 @@
parameters:
version:
type: string
default: 0.1.5879
sha256:
type: string
default: f178ea62c781aec06267017404f87983c87f171fd0e66ef3737916246ae66dd6
steps:
- run:
name: Install CircleCI CLI << parameters.version >>
command: |
CCI_VERSION="<< parameters.version >>"
CCI_SHA256="<< parameters.sha256 >>"
URL="https://github.com/CircleCI-Public/circleci-cli/releases/download/v${CCI_VERSION}/circleci-cli_${CCI_VERSION}_linux_amd64.tar.gz"
mkdir -p /tmp/circleci-cli/
curl --fail --show-error --location \
-o /tmp/circleci-cli/cli.tar.gz "${URL}"
echo "$CCI_SHA256 /tmp/circleci-cli/cli.tar.gz" | sha256sum -c
tar -xz --strip-components=1 \
-C /tmp/circleci-cli \
-f /tmp/circleci-cli/cli.tar.gz \
"circleci-cli_${CCI_VERSION}_linux_amd64/circleci"
sudo cp /tmp/circleci-cli/circleci /usr/bin/circleci-local-cli
circleci-local-cli version

21
.circleci/config/config.yml
View File

@ -7,15 +7,23 @@ references:
go-machine-recent-image: &go_machine_recent_image go-machine-recent-image: &go_machine_recent_image
ubuntu-1604:201903-01 ubuntu-1604:201903-01
# common references
common_envs: &common_envs
GOMAXPROCS: 1
NOMAD_SLOW_TEST: 1
GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
# disable implicit git paging. CircleCI runs commands with in a tty
# making git assume it's an interactive session.
PAGER: cat
GIT_PAGER: cat
executors: executors:
go: go:
working_directory: /go/src/github.com/hashicorp/nomad working_directory: /go/src/github.com/hashicorp/nomad
docker: docker:
- image: golang:1.12.13 - image: golang:1.12.13
environment: &common_envs environment:
GOMAXPROCS: 1 <<: *common_envs
NOMAD_SLOW_TEST: 1
GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
GOPATH: /go GOPATH: /go
go-machine: go-machine:
@ -23,13 +31,10 @@ executors:
machine: machine:
image: *go_machine_image image: *go_machine_image
environment: &machine_env environment: &machine_env
GOMAXPROCS: 1 <<: *common_envs
NOMAD_SLOW_TEST: 1
GOTESTSUM_JUNITFILE: /tmp/test-reports/results.xml
GOPATH: /home/circleci/go GOPATH: /home/circleci/go
GOLANG_VERSION: "1.12.13" GOLANG_VERSION: "1.12.13"
# uses a more recent image with unattended upgrades disabled properly # uses a more recent image with unattended upgrades disabled properly
# but seems to break docker builds # but seems to break docker builds
go-machine-recent: go-machine-recent:

4
.circleci/config/jobs/lint-go.yml
View File

@ -3,6 +3,10 @@ steps:
- checkout - checkout
- run: apt-get update; apt-get install -y shellcheck sudo unzip - run: apt-get update; apt-get install -y shellcheck sudo unzip
- install-protoc - install-protoc
- install-circleci-local-cli
- run: make deps lint-deps - run: make deps lint-deps
- run: make check - run: make check
- run: make checkscripts - run: make checkscripts
- run:
name: check .circleci/config.yml is up-to-date
command: make -C .circleci CIRCLECI="circleci-local-cli --skip-update-check" ci-verify

10
.circleci/config/workflows/build-test.yml
View File

@ -1,10 +1,17 @@
jobs: jobs:
- build-binaries - build-binaries:
# almost always build binaries as they may be needed
# for e2e tests
filters:
branches:
ignore:
- stable-website
- lint-go: - lint-go:
filters: &backend_branches_filter filters: &backend_branches_filter
branches: branches:
ignore: ignore:
- /^.-ui\b.*/ - /^.-ui\b.*/
- /^docs-.*/
- stable-website - stable-website
- test-machine: - test-machine:
name: "test-client" name: "test-client"
@ -58,5 +65,6 @@ jobs:
branches: branches:
ignore: ignore:
- stable-website - stable-website
- /^docs-.*/
- test-website: - test-website:
filters: *backend_branches_filter filters: *backend_branches_filter