M .builds/conformance-image-rebuild.yml => .builds/conformance-image-rebuild.yml +9 -1
@@ 12,7 12,7 @@ packages:
- curl
- ca-certificates
- docker.io
- - awscli
+ - unzip
- zstd
secrets:
- a42011da-a362-40da-9db6-1bf1f9be8be3 # ~/.s3-cache-key-id
@@ 29,6 29,12 @@ submitter:
enabled: false
allow-refs: []
tasks:
+ - install_awscli: |
+ curl -sSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" \
+ -o /tmp/awscliv2.zip
+ unzip -q /tmp/awscliv2.zip -d /tmp
+ sudo /tmp/aws/install
+ aws --version
- aws_credentials: |
mkdir -p ~/.aws
cat > ~/.aws/config <<EOF
@@ 38,6 44,8 @@ tasks:
addressing_style = path
signature_version = s3v4
EOF
+ echo 'export AWS_REQUEST_CHECKSUM_CALCULATION=when_required' >> ~/.buildenv
+ echo 'export AWS_RESPONSE_CHECKSUM_VALIDATION=when_required' >> ~/.buildenv
set +x
export AWS_ACCESS_KEY_ID=$(cat ~/.s3-cache-key-id)
export AWS_SECRET_ACCESS_KEY=$(cat ~/.s3-cache-key-secret)
M .builds/conformance.yml => .builds/conformance.yml +14 -1
@@ 7,7 7,7 @@ packages:
- cmake
- build-essential
- docker.io
- - awscli
+ - unzip
- zstd
secrets:
- a42011da-a362-40da-9db6-1bf1f9be8be3 # ~/.s3-cache-key-id
@@ 30,6 30,13 @@ submitter:
- refs/heads/master
- "refs/tags/*"
tasks:
+ - install_awscli: |
+ # awscli was dropped from Ubuntu noble's repos; install v2 from upstream.
+ curl -sSL "https://awscli.amazonaws.com/awscli-exe-linux-x86_64.zip" \
+ -o /tmp/awscliv2.zip
+ unzip -q /tmp/awscliv2.zip -d /tmp
+ sudo /tmp/aws/install
+ aws --version
- aws_credentials: |
mkdir -p ~/.aws
cat > ~/.aws/config <<EOF
@@ 39,6 46,12 @@ tasks:
addressing_style = path
signature_version = s3v4
EOF
+ # Garage doesn't implement the newer trailing CRC32 checksums that
+ # boto3 1.36+ sends by default — switch to "only when required".
+ echo 'export AWS_REQUEST_CHECKSUM_CALCULATION=when_required' >> ~/.buildenv
+ echo 'export AWS_RESPONSE_CHECKSUM_VALIDATION=when_required' >> ~/.buildenv
+ export AWS_REQUEST_CHECKSUM_CALCULATION=when_required
+ export AWS_RESPONSE_CHECKSUM_VALIDATION=when_required
set +x
export AWS_ACCESS_KEY_ID=$(cat ~/.s3-cache-key-id)
export AWS_SECRET_ACCESS_KEY=$(cat ~/.s3-cache-key-secret)