Skip to content

Commit cdabc7f

Browse files
authored
Merge aws#4388 from aws/fixci
fix(ci): "deadsnakes" causes unreliable CI
2 parents 819e63a + 44cb30c commit cdabc7f

File tree

1 file changed

+10
-12
lines changed

1 file changed

+10
-12
lines changed

buildspec/linuxIntegrationTests.yml

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -27,12 +27,13 @@ phases:
2727
- '>/dev/null apt-get -qq update'
2828
- '>/dev/null apt-get -qq install -y ca-certificates'
2929
- 'apt-get install --reinstall ca-certificates'
30-
- 'add-apt-repository -y ppa:deadsnakes/ppa'
3130
# Other dependencies.
32-
- 'apt-get -qq install -y jq python3.7 python3.8 python3-pip'
33-
# Fail early if any of these not found.
34-
- 'python3.7 --version'
35-
- 'python3.8 --version'
31+
- 'apt-get -qq install -y jq'
32+
- |
33+
curl --silent -LO https://github.com/aws/aws-sam-cli/releases/latest/download/aws-sam-cli-linux-x86_64.zip
34+
unzip -q aws-sam-cli-linux-x86_64.zip -d samcli
35+
sudo ./samcli/install
36+
rm -rf samcli
3637
# login to DockerHub so we don't get throttled
3738
# - docker login --username $(echo $DOCKER_HUB_TOKEN | jq -r '.username') --password $(echo $DOCKER_HUB_TOKEN | jq -r '.password') || true
3839
# increase file watcher count so CodeLens tests do not fail unexpectedly (ENOSPC error)
@@ -51,13 +52,10 @@ phases:
5152
- export HOME=/home/codebuild-user
5253
- bash buildspec/shared/setup-github-token.sh
5354
- bash buildspec/shared/linux-pre_build.sh
54-
# Where non-root "pip3 install" puts things:
55-
- 'export PATH="$HOME/.local/bin:$PATH"'
56-
- '>/dev/null pip3 install --upgrade aws-sam-cli'
57-
- '>/dev/null pip3 install --upgrade awscli'
58-
# Print info about sam (version, location, …).
59-
- 'pip3 show aws-sam-cli'
60-
- 'sam --version'
55+
# Print info (version, location, …) or fail early.
56+
- |
57+
python3 --version
58+
sam --version
6159
# Install latest version of Go (known to 'goenv')
6260
# - eval "$(goenv init -)"
6361
# - 'export PATH="$GOROOT/bin:$PATH:$GOPATH/bin"'

0 commit comments

Comments
 (0)