From 85ff0868204e69f102cc0f34f4ba0e4ef06ee873 Mon Sep 17 00:00:00 2001 From: Chris Evich Date: Tue, 19 Mar 2019 17:14:40 -0400 Subject: Cirrus: Run vendor check in parallel This task is heavily network bound, and takes way too long to include along with the gating task. Separate it out and run it in parallel to everything else. Also add some reasonable timeouts. Signed-off-by: Chris Evich --- .cirrus.yml | 40 +++++++++++++++++++++++++++++++--------- 1 file changed, 31 insertions(+), 9 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 01689971a..58725fe90 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -118,20 +118,13 @@ gating_task: cpu: 4 memory: 12 + timeout_in: 20m + gate_script: - '/usr/local/bin/entrypoint.sh validate' - '/usr/local/bin/entrypoint.sh lint' - '${CIRRUS_WORKING_DIR}/${SCRIPT_BASE}/test/test_dot_cirrus_yaml.py' - # This task runs `make vendor` followed by ./hack/tree_status.sh to check - # whether the git tree is clean. The reasoning for that is to make sure - # that the vendor.conf, the code and the vendored packages in ./vendor are - # in sync at all times. - vendor_script: - - '/usr/local/bin/entrypoint.sh .install.vndr' - - '/usr/local/bin/entrypoint.sh vendor' - - 'cd /go/src/github.com/containers/libpod && ./hack/tree_status.sh' - # This task builds Podman with different buildtags to ensure the build does # not break. build_script: @@ -144,6 +137,35 @@ gating_task: master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh' +# This task runs `make vendor` followed by ./hack/tree_status.sh to check +# whether the git tree is clean. The reasoning for that is to make sure +# that the vendor.conf, the code and the vendored packages in ./vendor are +# in sync at all times. +vendor_task: + + depends_on: + - "gating" + + env: + CIRRUS_WORKING_DIR: "/usr/src/libpod" + + # Runs within Cirrus's "community cluster" + container: + image: "quay.io/libpod/gate:latest" + cpu: 4 + memory: 12 + + timeout_in: 30m + + vendor_script: + - '/usr/local/bin/entrypoint.sh .install.vndr' + - '/usr/local/bin/entrypoint.sh vendor' + - 'cd /go/src/github.com/containers/libpod && ./hack/tree_status.sh' + + on_failure: + master_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_master_failure.sh' + + build_each_commit_task: depends_on: -- cgit v1.2.3-54-g00ecf