From c1a6e67183e13ad870d12b0a052ef2dcb00bfa1d Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 25 Aug 2020 13:02:22 -0400 Subject: Revert "HACK: Manually include c/storage #698" This reverts commit ae2ee65eff71c5780e4484f1316dbbdd87bf1760. This was a horrible hack that we did for time reasons, to get 2.0.5 out on schedule; now that it has been merged into c/storage properly we no longer need or want it. Signed-off-by: Matthew Heon --- .cirrus.yml | 50 +++++++++++++++++++++++++++++--------------------- 1 file changed, 29 insertions(+), 21 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 06ebb0c96..87c135b78 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -204,34 +204,34 @@ rpmbuild_task: # 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: +vendor_task: -# only_if: >- -# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && -# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' + only_if: >- + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' -# depends_on: -# - "gating" + depends_on: + - "gating" -# env: -# CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/libpod" -# GOPATH: "/var/tmp/go" -# GOSRC: "$CIRRUS_WORKING_DIR" + env: + CIRRUS_WORKING_DIR: "/var/tmp/go/src/github.com/containers/libpod" + GOPATH: "/var/tmp/go" + GOSRC: "$CIRRUS_WORKING_DIR" -# # Runs within Cirrus's "community cluster" -# container: -# image: docker.io/library/golang:1.13 -# cpu: 4 -# memory: 12 + # Runs within Cirrus's "community cluster" + container: + image: docker.io/library/golang:1.13 + cpu: 4 + memory: 12 -# timeout_in: 30m + timeout_in: 30m -# vendor_script: -# - 'cd ${CIRRUS_WORKING_DIR} && make vendor' -# - 'cd ${CIRRUS_WORKING_DIR} && ./hack/tree_status.sh' + vendor_script: + - 'cd ${CIRRUS_WORKING_DIR} && make vendor' + - 'cd ${CIRRUS_WORKING_DIR} && ./hack/tree_status.sh' -# on_failure: -# failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}' + on_failure: + failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh |& ${TIMESTAMP}' # This task runs `make varlink_api_generate` followed by ./hack/tree_status.sh to check @@ -305,6 +305,7 @@ build_without_cgo_task: depends_on: - "gating" + - "vendor" - "varlink_api" only_if: >- @@ -365,6 +366,7 @@ testing_task: alias: "testing" depends_on: - "gating" + - "vendor" - "varlink_api" - "build_without_cgo" - "container_image_build" @@ -429,6 +431,7 @@ special_testing_rootless_task: depends_on: - "gating" - "varlink_api" + - "vendor" - "build_without_cgo" only_if: >- @@ -463,6 +466,7 @@ special_testing_in_podman_task: depends_on: - "gating" - "varlink_api" + - "vendor" - "build_without_cgo" only_if: >- @@ -501,6 +505,7 @@ special_testing_cross_task: depends_on: - "gating" - "varlink_api" + - "vendor" only_if: >- $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && @@ -538,6 +543,7 @@ special_testing_bindings_task: depends_on: - "gating" - "varlink_api" + - "vendor" only_if: >- $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && @@ -564,6 +570,7 @@ special_testing_endpoint_task: depends_on: - "gating" - "varlink_api" + - "vendor" only_if: >- $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && @@ -688,6 +695,7 @@ success_task: # ignores any dependent task conditions depends_on: - "gating" + - "vendor" - "varlink_api" - "build_without_cgo" - "container_image_build" -- cgit v1.2.3-54-g00ecf From ab4283c5a66deb2b8f45c9d55077a9efabe22613 Mon Sep 17 00:00:00 2001 From: Matthew Heon Date: Tue, 25 Aug 2020 13:03:49 -0400 Subject: Revert "HACK: Disable build-each-commit" This reverts commit 44e5d0c1e8272f92d0fa6d41075a0127b241f003. We temporarily disabled this for the last few backports for 2.0.5, given how painful the libpod->podman move made things. We do not want to keep this around long-term, each commit should be required to build. Signed-off-by: Matthew Heon --- .cirrus.yml | 50 +++++++++++++++++++++++++++----------------------- 1 file changed, 27 insertions(+), 23 deletions(-) (limited to '.cirrus.yml') diff --git a/.cirrus.yml b/.cirrus.yml index 87c135b78..af28b823b 100644 --- a/.cirrus.yml +++ b/.cirrus.yml @@ -269,36 +269,36 @@ varlink_api_task: failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh' -# build_each_commit_task: +build_each_commit_task: -# depends_on: -# - "gating" -# - "vendor" -# - "varlink_api" + depends_on: + - "gating" + - "vendor" + - "varlink_api" -# only_if: >- -# $CIRRUS_BRANCH != $DEST_BRANCH && -# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && -# $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' + only_if: >- + $CIRRUS_BRANCH != $DEST_BRANCH && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:IMG.*' && + $CIRRUS_CHANGE_MESSAGE !=~ '.*CI:DOCS.*' -# gce_instance: -# cpu: 8 -# memory: "8Gb" + gce_instance: + cpu: 8 + memory: "8Gb" -# env: -# MOD_CONTAINERS_CONF: 'false' + env: + MOD_CONTAINERS_CONF: 'false' -# timeout_in: 30m + timeout_in: 30m -# setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' -# build_each_commit_script: -# # set -x by default, no need to spew contents of lib.sh -# - 'source $SCRIPT_BASE/lib.sh &> /dev/null' -# - 'git fetch --depth 50 origin $DEST_BRANCH |& ${TIMESTAMP}' -# - 'make build-all-new-commits GIT_BASE_BRANCH=origin/$DEST_BRANCH |& ${TIMESTAMP}' + setup_environment_script: '$SCRIPT_BASE/setup_environment.sh |& ${TIMESTAMP}' + build_each_commit_script: + # set -x by default, no need to spew contents of lib.sh + - 'source $SCRIPT_BASE/lib.sh &> /dev/null' + - 'git fetch --depth 50 origin $DEST_BRANCH |& ${TIMESTAMP}' + - 'make build-all-new-commits GIT_BASE_BRANCH=origin/$DEST_BRANCH |& ${TIMESTAMP}' -# on_failure: -# failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh' + on_failure: + failed_branch_script: '$CIRRUS_WORKING_DIR/$SCRIPT_BASE/notice_branch_failure.sh' build_without_cgo_task: @@ -368,6 +368,7 @@ testing_task: - "gating" - "vendor" - "varlink_api" + - "build_each_commit" - "build_without_cgo" - "container_image_build" @@ -432,6 +433,7 @@ special_testing_rootless_task: - "gating" - "varlink_api" - "vendor" + - "build_each_commit" - "build_without_cgo" only_if: >- @@ -467,6 +469,7 @@ special_testing_in_podman_task: - "gating" - "varlink_api" - "vendor" + - "build_each_commit" - "build_without_cgo" only_if: >- @@ -697,6 +700,7 @@ success_task: - "gating" - "vendor" - "varlink_api" + - "build_each_commit" - "build_without_cgo" - "container_image_build" - "meta" -- cgit v1.2.3-54-g00ecf