Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

build/builder: install awscli v2 #72907

Merged
merged 1 commit into from
Nov 18, 2021

Conversation

erikgrinaker
Copy link
Contributor

@erikgrinaker erikgrinaker commented Nov 18, 2021

roachprod requires awscli v2, but the builder image included v1.

Release note: None

@erikgrinaker erikgrinaker self-assigned this Nov 18, 2021
@erikgrinaker erikgrinaker requested a review from a team as a code owner November 18, 2021 11:04
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Copy link
Member

@rail rail left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewed 2 of 2 files at r1, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @erikgrinaker, @rail, and @rickystewart)


build/builder/Dockerfile, line 173 at r2 (raw file):

  unzip awscliv2.zip && \
  ./aws/install && \
  rm -rf awscliv2.zip aws

Can we pin the version, like we do for roachprod:

# Debian ships with awscli version 1.x, which is unsupported by roachprod.
# Install aws-cli using the official instructions from
# https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-linux.html
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.0.30.zip" -o "awscliv2.zip"
sha256sum -c - <<EOF
7ee475f22c1b35cc9e53affbf96a9ffce91706e154a9441d0d39cbf8366b718e awscliv2.zip

Copy link
Member

@rail rail left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @erikgrinaker, @rail, and @rickystewart)


build/builder/Dockerfile, line 173 at r2 (raw file):

Previously, rail (Rail Aliiev) wrote…

Can we pin the version, like we do for roachprod:

# Debian ships with awscli version 1.x, which is unsupported by roachprod.
# Install aws-cli using the official instructions from
# https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-linux.html
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.0.30.zip" -o "awscliv2.zip"
sha256sum -c - <<EOF
7ee475f22c1b35cc9e53affbf96a9ffce91706e154a9441d0d39cbf8366b718e awscliv2.zip

# Debian ships with awscli version 1.x, which is unsupported by roachprod.
# Install aws-cli using the official instructions from
# https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-linux.html
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.0.30.zip" -o "awscliv2.zip"
sha256sum -c - <<EOF
7ee475f22c1b35cc9e53affbf96a9ffce91706e154a9441d0d39cbf8366b718e awscliv2.zip
EOF
unzip awscliv2.zip
./aws/install
rm -rf aws awscliv2.zip
rather

Copy link
Contributor Author

@erikgrinaker erikgrinaker left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @rail and @rickystewart)


build/builder/Dockerfile, line 173 at r2 (raw file):

Previously, rail (Rail Aliiev) wrote…

# Debian ships with awscli version 1.x, which is unsupported by roachprod.
# Install aws-cli using the official instructions from
# https://docs.aws.amazon.com/cli/latest/userguide/install-cliv2-linux.html
curl "https://awscli.amazonaws.com/awscli-exe-linux-x86_64-2.0.30.zip" -o "awscliv2.zip"
sha256sum -c - <<EOF
7ee475f22c1b35cc9e53affbf96a9ffce91706e154a9441d0d39cbf8366b718e awscliv2.zip
EOF
unzip awscliv2.zip
./aws/install
rm -rf aws awscliv2.zip
rather

Good call, done.

@erikgrinaker
Copy link
Contributor Author

This breaks the AWS nightly tests. It would be great if we could merge this and push a new image before the next nightly run.

`roachprod` requires awscli v2, but the `builder` image included v1.

Release note: None
@erikgrinaker
Copy link
Contributor Author

Going to skip CI on this one, image is pushed and builder.sh works. TFTR!

bors r=rail

@craig
Copy link
Contributor

craig bot commented Nov 18, 2021

Build succeeded:

@craig craig bot merged commit 4c8c0d4 into cockroachdb:master Nov 18, 2021
@erikgrinaker erikgrinaker deleted the builder-awscli-v2 branch November 25, 2021 19:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants