Skip to content

Commit

Permalink
build: Align drone base images (k3s-io#8959)
Browse files Browse the repository at this point in the history
Align the base images used in drone with the images used across the
ecosystem.

Signed-off-by: Paulo Gomes <paulo.gomes@suse.com>
  • Loading branch information
pjbgf authored Feb 7, 2024
1 parent 950473e commit 358c4d6
Showing 1 changed file with 19 additions and 13 deletions.
32 changes: 19 additions & 13 deletions .drone.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@ steps:
- pull_request

- name: build
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader, unprivileged_github_token ]
environment:
GITHUB_TOKEN:
Expand All @@ -48,7 +48,7 @@ steps:
path: /var/run/docker.sock

- name: validate-cross-compilation
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
commands:
- dapper validate-cross-compilation
volumes:
Expand All @@ -73,7 +73,7 @@ steps:
- tag

- name: github_binary_release
image: ibuildthecloud/github-release:v0.0.1
image: plugins/github-release
settings:
api_key:
from_secret: github_token
Expand Down Expand Up @@ -114,7 +114,7 @@ steps:
- tag

- name: test
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment:
ENABLE_REGISTRY: 'true'
Expand All @@ -132,7 +132,7 @@ steps:
path: /var/run/docker.sock

- name: github_e2e_logs_release
image: ibuildthecloud/github-release:v0.0.1
image: plugins/github-release
settings:
api_key:
from_secret: github_token
Expand Down Expand Up @@ -169,7 +169,7 @@ trigger:

steps:
- name: build
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
commands:
- dapper ci
- echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags
Expand All @@ -178,7 +178,7 @@ steps:
path: /var/run/docker.sock

- name: test
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
environment:
ENABLE_REGISTRY: 'true'
commands:
Expand Down Expand Up @@ -228,7 +228,7 @@ steps:
- pull_request

- name: build
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment:
AWS_SECRET_ACCESS_KEY:
Expand All @@ -243,7 +243,7 @@ steps:
path: /var/run/docker.sock

- name: github_binary_release
image: ibuildthecloud/github-release:v0.0.1
image: plugins/github-release
settings:
api_key:
from_secret: github_token
Expand Down Expand Up @@ -284,7 +284,7 @@ steps:
- tag

- name: test
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment:
ENABLE_REGISTRY: 'true'
Expand Down Expand Up @@ -339,6 +339,11 @@ steps:
- pull_request

- name: build
# Keeping Dapper at v0.5.0 for armv7, as newer versions fails with
# Bad system call on this architecture. xref:
#
# https://github.com/k3s-io/k3s/pull/8959#discussion_r1439736566
# https://drone-pr.k3s.io/k3s-io/k3s/7922/3/3
image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment:
Expand All @@ -354,7 +359,7 @@ steps:
path: /var/run/docker.sock

- name: github_binary_release
image: ibuildthecloud/github-release:v0.0.1
image: plugins/github-release
settings:
api_key:
from_secret: github_token
Expand Down Expand Up @@ -395,6 +400,7 @@ steps:
- tag

- name: test
# Refer to comment for arm/build.
image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment:
Expand Down Expand Up @@ -448,7 +454,7 @@ steps:
- pull_request

- name: validate_go_mods
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
commands:
- docker build --target test-mods -t k3s:mod -f Dockerfile.test .
- docker run -i k3s:mod
Expand Down Expand Up @@ -604,7 +610,7 @@ steps:
- pull_request

- name: build-e2e-image
image: rancher/dapper:v0.5.0
image: rancher/dapper:v0.6.0
commands:
- DOCKER_BUILDKIT=1 docker build --target test-e2e -t test-e2e -f Dockerfile.test .
- SKIP_VALIDATE=true SKIP_AIRGAP=true GOCOVER=1 dapper ci
Expand Down

0 comments on commit 358c4d6

Please sign in to comment.