Skip to content

Commit bc016d9

Browse files
authored
Merge pull request #252 from kzys/go-location
Use Go 1.13 in /usr/lib/go-1.13
2 parents 0917e0b + 82bcb25 commit bc016d9

File tree

1 file changed

+8
-2
lines changed

1 file changed

+8
-2
lines changed

.buildkite/pipeline.yml

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
# on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either
1111
# express or implied. See the License for the specific language governing
1212
# permissions and limitations under the License.
13+
env:
14+
PATH: "/usr/lib/go-1.13/bin:/usr/bin"
1315

1416
steps:
1517
- label: ':ec2: environment'
@@ -94,7 +96,7 @@ steps:
9496
- 'ln -s /var/lib/fc-ci/rootfs.ext4 testdata/root-drive.img'
9597
- 'mkdir -p $(pwd)/testdata/bin'
9698
- 'make -C cni install CNI_BIN_ROOT=$(pwd)/testdata/bin'
97-
- "sudo FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
99+
- "sudo PATH=$PATH FC_TEST_TAP=fc-root-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
98100
agents:
99101
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
100102
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
@@ -116,7 +118,7 @@ steps:
116118
- 'chmod +x testdata/firecracker-master'
117119
- 'buildkite-agent artifact download testdata/jailer-master .'
118120
- 'chmod +x testdata/jailer-master'
119-
- "sudo -E FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
121+
- "sudo -E PATH=$PATH FC_TEST_TAP=fc-mst-tap${BUILDKITE_BUILD_NUMBER} make test EXTRAGOARGS='-v -count=1 -race' DISABLE_ROOT_TESTS="
120122
agents:
121123
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
122124
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
@@ -128,6 +130,10 @@ steps:
128130
- test -z "$(git status --porcelain)" && exit 0 || git --no-pager diff && echo -e '\ngo.mod and/or go.sum differ from committed, please run "go mod tidy" and commit the updated files.\n' && exit 42
129131
soft_fail:
130132
- exit_status: 42 # Dependabot doesn't modify go.mod and go.sum
133+
agents:
134+
queue: "${BUILDKITE_AGENT_META_DATA_QUEUE:-default}"
135+
distro: "${BUILDKITE_AGENT_META_DATA_DISTRO}"
136+
hostname: "${BUILDKITE_AGENT_META_DATA_HOSTNAME}"
131137

132138
# This allows the cleanup step to always run, regardless of test failure
133139
- wait: ~

0 commit comments

Comments
 (0)