Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Cirrus: Re-order tasks for more parallelism #3707

Merged
merged 1 commit into from
Jan 12, 2022
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 27 additions & 33 deletions .cirrus.yml
Original file line number Diff line number Diff line change
Expand Up @@ -128,13 +128,35 @@ vendor_task:
- './hack/tree_status.sh'


# Confirm cross-compile ALL architectures on a Mac OS-X VM.
cross_build_task:
name: "Cross Compile"
alias: cross_build
only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'

osx_instance:
image: 'big-sur-base'

script:
- brew update
- brew install go
- brew install go-md2man
- brew install gpgme
- go version
- make cross CGO_ENABLED=0

binary_artifacts:
path: ./bin/*


unit_task:
name: 'Unit tests w/ $STORAGE_DRIVER'
alias: unit
only_if: &not_docs $CIRRUS_CHANGE_TITLE !=~ '.*CI:DOCS.*'
depends_on:
only_if: *not_docs
depends_on: &smoke_vendor_cross
- smoke
- vendor
- cross_build

timeout_in: 1h

Expand All @@ -156,8 +178,7 @@ conformance_task:
name: 'Build Conformance w/ $STORAGE_DRIVER'
alias: conformance
only_if: *not_docs
depends_on:
- unit
depends_on: *smoke_vendor_cross

gce_instance:
image_name: "${UBUNTU_CACHE_IMAGE_NAME}"
Expand All @@ -174,36 +195,11 @@ conformance_task:
conformance_test_script: '${SCRIPT_BASE}/test.sh conformance |& ${_TIMESTAMP}'


# Confirm cross-compile ALL architectures on a Mac OS-X VM.
cross_build_task:
name: "Cross Compile"
alias: cross_build
only_if: *not_docs
depends_on:
- unit

osx_instance:
image: 'big-sur-base'

script:
- brew update
- brew install go
- brew install go-md2man
- brew install gpgme
- go version
- make cross CGO_ENABLED=0

binary_artifacts:
path: ./bin/*


integration_task:
name: "Integration $DISTRO_NV w/ $STORAGE_DRIVER"
alias: integration
only_if: *not_docs
depends_on:
- smoke
- vendor
depends_on: *smoke_vendor_cross

matrix:
# VFS
Expand Down Expand Up @@ -259,9 +255,7 @@ in_podman_task:
name: "Containerized Integration"
alias: in_podman
only_if: *not_docs
depends_on:
- smoke
- vendor
depends_on: *smoke_vendor_cross

env:
# This is key, cause the scripts to re-execute themselves inside a container.
Expand Down