Skip to content

K
k3s
Commit 7c75aced authored by Brad Davidson's avatar Brad Davidson Committed by Brad Davidson
Browse files
Options

Fix artifact upload with `aws s3 cp`; update secret

Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com> (cherry picked from commit 953c7699) Signed-off-by: 's avatarBrad Davidson <brad.davidson@rancher.com>
parent 060adae6
Hide whitespace changes
Inline Side-by-side
Showing with 28 additions and 25 deletions
.drone.yml
View file @ 7c75aced
...@@ -9,14 +9,14 @@ platform: ...@@ -9,14 +9,14 @@ platform:
steps: steps:
- name: build - name: build
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader, unprivileged_github_token ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader, unprivileged_github_token ]
environment: environment:
GITHUB_TOKEN: GITHUB_TOKEN:
from_secret: unprivileged_github_token from_secret: unprivileged_github_token
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
- dapper ci - dapper ci
- echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags - echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags
...@@ -90,13 +90,13 @@ steps: ...@@ -90,13 +90,13 @@ steps:
- name: test - name: test
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
ENABLE_REGISTRY: 'true' ENABLE_REGISTRY: 'true'
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
- docker build --target test-k3s -t k3s:test-${DRONE_STAGE_ARCH}-${DRONE_COMMIT} -f Dockerfile.test . - docker build --target test-k3s -t k3s:test-${DRONE_STAGE_ARCH}-${DRONE_COMMIT} -f Dockerfile.test .
- > - >
...@@ -139,12 +139,12 @@ platform: ...@@ -139,12 +139,12 @@ platform:
steps: steps:
- name: build - name: build
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
- dapper ci - dapper ci
- echo "${DRONE_TAG}-arm64" | sed -e 's/+/-/g' >.tags - echo "${DRONE_TAG}-arm64" | sed -e 's/+/-/g' >.tags
...@@ -193,13 +193,13 @@ steps: ...@@ -193,13 +193,13 @@ steps:
- name: test - name: test
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
ENABLE_REGISTRY: 'true' ENABLE_REGISTRY: 'true'
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
- docker build --target test-k3s -t k3s:test-${DRONE_STAGE_ARCH}-${DRONE_COMMIT} -f Dockerfile.test . - docker build --target test-k3s -t k3s:test-${DRONE_STAGE_ARCH}-${DRONE_COMMIT} -f Dockerfile.test .
- > - >
...@@ -225,12 +225,12 @@ platform: ...@@ -225,12 +225,12 @@ platform:
steps: steps:
- name: build - name: build
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
- dapper ci - dapper ci
- echo "${DRONE_TAG}-arm" | sed -e 's/+/-/g' >.tags - echo "${DRONE_TAG}-arm" | sed -e 's/+/-/g' >.tags
...@@ -279,13 +279,13 @@ steps: ...@@ -279,13 +279,13 @@ steps:
- name: test - name: test
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
ENABLE_REGISTRY: 'true' ENABLE_REGISTRY: 'true'
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
- docker build --target test-k3s -t k3s:test-${DRONE_STAGE_ARCH}-${DRONE_COMMIT} -f Dockerfile.test . - docker build --target test-k3s -t k3s:test-${DRONE_STAGE_ARCH}-${DRONE_COMMIT} -f Dockerfile.test .
- > - >
...@@ -325,12 +325,12 @@ steps: ...@@ -325,12 +325,12 @@ steps:
- name: build - name: build
image: rancher/dapper:v0.5.8 image: rancher/dapper:v0.5.8
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
- dapper ci - dapper ci
- echo "${DRONE_TAG}-s390x" | sed -e 's/+/-/g' >.tags - echo "${DRONE_TAG}-s390x" | sed -e 's/+/-/g' >.tags
...@@ -382,13 +382,13 @@ steps: ...@@ -382,13 +382,13 @@ steps:
- name: test - name: test
image: rancher/dapper:v0.5.8 image: rancher/dapper:v0.5.8
secrets: [ AWS_SECRET_ACCESS_KEY-artifact-uploader, AWS_ACCESS_KEY_ID-artifact-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
ENABLE_REGISTRY: 'true' ENABLE_REGISTRY: 'true'
AWS_SECRET_ACCESS_KEY: AWS_SECRET_ACCESS_KEY:
from_secret: AWS_SECRET_ACCESS_KEY-artifact-uploader from_secret: AWS_SECRET_ACCESS_KEY-k3s-ci-uploader
AWS_ACCESS_KEY_ID: AWS_ACCESS_KEY_ID:
from_secret: AWS_ACCESS_KEY_ID-artifact-uploader from_secret: AWS_ACCESS_KEY_ID-k3s-ci-uploader
commands: commands:
# we hardcode s390x as the arch because DRONE_STAGE_ARCH is set to amd64 # we hardcode s390x as the arch because DRONE_STAGE_ARCH is set to amd64
- docker build --target test-k3s -t k3s:test-s390x-${DRONE_COMMIT} -f Dockerfile.test . - docker build --target test-k3s -t k3s:test-s390x-${DRONE_COMMIT} -f Dockerfile.test .
......
scripts/build-upload
View file @ 7c75aced
...@@ -34,6 +34,9 @@ BUILD_NAME=$(basename $1)-$2 ...@@ -34,6 +34,9 @@ BUILD_NAME=$(basename $1)-$2
(cd $(dirname $1) && sha256sum $(basename $1)) >${TMPDIR}/${BUILD_NAME}.sha256sum (cd $(dirname $1) && sha256sum $(basename $1)) >${TMPDIR}/${BUILD_NAME}.sha256sum
cp $1 ${TMPDIR}/${BUILD_NAME} cp $1 ${TMPDIR}/${BUILD_NAME}
aws s3 cp ${TMPDIR}/${BUILD_NAME}* s3://k3s-ci-builds || exit 1 for FILE in ${TMPDIR}/${BUILD_NAME}*; do
aws s3 cp ${FILE} s3://k3s-ci-builds || exit 1
done
echo "Build uploaded" >&2 echo "Build uploaded" >&2
echo "https://k3s-ci-builds.s3.amazonaws.com/${BUILD_NAME}" echo "https://k3s-ci-builds.s3.amazonaws.com/${BUILD_NAME}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment