From 52aed22a563be817cdf6ad5a01dedbad40b94b35 Mon Sep 17 00:00:00 2001 From: xibz Date: Tue, 3 Mar 2020 20:23:29 +0000 Subject: [PATCH] Move soft_fail back to master tests Due to some wanting to be able to sync with master with a breaking change, we swapped which tests were failing, from master tests to root tests. Now that we've merged in v0.21.0 of Firecracker, root tests should now pass Signed-off-by: xibz --- .buildkite/pipeline.yml | 14 ++++++-------- 1 file changed, 6 insertions(+), 8 deletions(-) diff --git a/.buildkite/pipeline.yml b/.buildkite/pipeline.yml index 421aa1bb3..755cb0275 100644 --- a/.buildkite/pipeline.yml +++ b/.buildkite/pipeline.yml @@ -80,8 +80,8 @@ steps: commands: - 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux' - 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img' - - 'ln -s /usr/local/bin/firecracker-v0.20.0 testdata/firecracker' - - 'ln -s /usr/local/bin/jailer-v0.20.0 testdata/jailer' + - 'ln -s /usr/local/bin/firecracker-v0.21.0 testdata/firecracker' + - 'ln -s /usr/local/bin/jailer-v0.21.0 testdata/jailer' - "FC_TEST_TAP=fc-test-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS=true" agents: queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}" @@ -93,17 +93,14 @@ steps: commands: - 'ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux' - 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img' - - 'cp /usr/local/bin/firecracker-v0.20.0 testdata/firecracker' - - 'cp /usr/local/bin/jailer-v0.20.0 testdata/jailer' + - 'cp /usr/local/bin/firecracker-v0.21.0 testdata/firecracker' + - 'cp /usr/local/bin/jailer-v0.21.0 testdata/jailer' - 'make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin' - "sudo FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS=" agents: queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}" distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}" hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}" - # TODO: Remove this once v0.21.0 has been released - soft_fail: # we softfail here since v0.20.0 jailer tests will be broken. - - exit_status: "*" - label: ':hammer: test against firecracker master' env: @@ -123,7 +120,8 @@ steps: queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}" distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}" hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}" - # TODO: move soft_fail here once v0.21.0 of firecracker has been released + soft_fail: + - exit_status: "*" - label: 'go mod tidy' commands: