@@ -68,10 +68,22 @@ steps:
6868 agents :
6969 queue : " ${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
7070
71+ - label : ' :package: install'
72+ commands :
73+ # Install tc-redirect-tap.
74+ - ' mkdir -p testdata/bin'
75+ - ' GOBIN=$(pwd)/testdata/bin go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap'
76+ # Copy vmlinux and root-drive.img.
77+ - ' ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
78+ - ' ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
79+ agents :
80+ queue : " ${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
81+ distro : " ${BUILDKITE_AGENT_META_DATA_DISTRO}"
82+ hostname : " ${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
83+
7184 - label : ' build'
7285 commands :
7386 - ' make'
74- - ' make -C cni'
7587 agents :
7688 queue : " ${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
7789 distro : " ${BUILDKITE_AGENT_META_DATA_DISTRO}"
@@ -95,7 +107,6 @@ steps:
95107 - ' ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
96108 - ' ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
97109 - ' mkdir -p $(pwd)/testdata/bin'
98- - ' make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
99110 - " sudo PATH=$PATH FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
100111 agents :
101112 queue : " ${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
@@ -112,12 +123,13 @@ steps:
112123 commands :
113124 - ' ln -s /var/lib/fc-ci/vmlinux.bin testdata/vmlinux'
114125 - ' ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
115- - ' mkdir -p $(pwd)/testdata/bin'
116- - ' make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
117126 - ' buildkite-agent artifact download testdata/firecracker-master .'
118127 - ' chmod +x testdata/firecracker-master'
119128 - ' buildkite-agent artifact download testdata/jailer-master .'
120129 - ' chmod +x testdata/jailer-master'
130+ # Install tc-redirect-tap.
131+ - ' mkdir -p testdata/bin'
132+ - ' GOBIN=$(pwd)/testdata/bin go get github.com/awslabs/tc-redirect-tap/cmd/tc-redirect-tap'
121133 - " sudo -E PATH=$PATH FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
122134 agents :
123135 queue : " ${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
0 commit comments