Skip to content

K
k3s
Unverified Commit 358c4d6a authored by Paulo Gomes's avatar Paulo Gomes Committed by GitHub
Browse files
Options

build: Align drone base images (#8959)

Align the base images used in drone with the images used across the ecosystem. Signed-off-by: 's avatarPaulo Gomes <paulo.gomes@suse.com>
parent 950473e3
Hide whitespace changes
Inline Side-by-side
Showing with 19 additions and 13 deletions
.drone.yml
View file @ 358c4d6a
...@@ -31,7 +31,7 @@ steps: ...@@ -31,7 +31,7 @@ steps:
- pull_request - pull_request
- name: build - 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 ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader, unprivileged_github_token ]
environment: environment:
GITHUB_TOKEN: GITHUB_TOKEN:
...@@ -48,7 +48,7 @@ steps: ...@@ -48,7 +48,7 @@ steps:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: validate-cross-compilation - name: validate-cross-compilation
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.6.0
commands: commands:
- dapper validate-cross-compilation - dapper validate-cross-compilation
volumes: volumes:
...@@ -73,7 +73,7 @@ steps: ...@@ -73,7 +73,7 @@ steps:
- tag - tag
- name: github_binary_release - name: github_binary_release
image: ibuildthecloud/github-release:v0.0.1 image: plugins/github-release
settings: settings:
api_key: api_key:
from_secret: github_token from_secret: github_token
...@@ -114,7 +114,7 @@ steps: ...@@ -114,7 +114,7 @@ steps:
- tag - tag
- name: test - 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 ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
ENABLE_REGISTRY: 'true' ENABLE_REGISTRY: 'true'
...@@ -132,7 +132,7 @@ steps: ...@@ -132,7 +132,7 @@ steps:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: github_e2e_logs_release - name: github_e2e_logs_release
image: ibuildthecloud/github-release:v0.0.1 image: plugins/github-release
settings: settings:
api_key: api_key:
from_secret: github_token from_secret: github_token
...@@ -169,7 +169,7 @@ trigger: ...@@ -169,7 +169,7 @@ trigger:
steps: steps:
- name: build - name: build
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.6.0
commands: commands:
- dapper ci - dapper ci
- echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags - echo "${DRONE_TAG}-amd64" | sed -e 's/+/-/g' >.tags
...@@ -178,7 +178,7 @@ steps: ...@@ -178,7 +178,7 @@ steps:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: test - name: test
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.6.0
environment: environment:
ENABLE_REGISTRY: 'true' ENABLE_REGISTRY: 'true'
commands: commands:
...@@ -228,7 +228,7 @@ steps: ...@@ -228,7 +228,7 @@ steps:
- pull_request - pull_request
- name: build - 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 ] 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:
...@@ -243,7 +243,7 @@ steps: ...@@ -243,7 +243,7 @@ steps:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: github_binary_release - name: github_binary_release
image: ibuildthecloud/github-release:v0.0.1 image: plugins/github-release
settings: settings:
api_key: api_key:
from_secret: github_token from_secret: github_token
...@@ -284,7 +284,7 @@ steps: ...@@ -284,7 +284,7 @@ steps:
- tag - tag
- name: test - 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 ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
ENABLE_REGISTRY: 'true' ENABLE_REGISTRY: 'true'
...@@ -339,6 +339,11 @@ steps: ...@@ -339,6 +339,11 @@ steps:
- pull_request - pull_request
- name: build - 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 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
...@@ -354,7 +359,7 @@ steps: ...@@ -354,7 +359,7 @@ steps:
path: /var/run/docker.sock path: /var/run/docker.sock
- name: github_binary_release - name: github_binary_release
image: ibuildthecloud/github-release:v0.0.1 image: plugins/github-release
settings: settings:
api_key: api_key:
from_secret: github_token from_secret: github_token
...@@ -395,6 +400,7 @@ steps: ...@@ -395,6 +400,7 @@ steps:
- tag - tag
- name: test - name: test
# Refer to comment for arm/build.
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.5.0
secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ] secrets: [ AWS_SECRET_ACCESS_KEY-k3s-ci-uploader, AWS_ACCESS_KEY_ID-k3s-ci-uploader ]
environment: environment:
...@@ -448,7 +454,7 @@ steps: ...@@ -448,7 +454,7 @@ steps:
- pull_request - pull_request
- name: validate_go_mods - name: validate_go_mods
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.6.0
commands: commands:
- docker build --target test-mods -t k3s:mod -f Dockerfile.test . - docker build --target test-mods -t k3s:mod -f Dockerfile.test .
- docker run -i k3s:mod - docker run -i k3s:mod
...@@ -604,7 +610,7 @@ steps: ...@@ -604,7 +610,7 @@ steps:
- pull_request - pull_request
- name: build-e2e-image - name: build-e2e-image
image: rancher/dapper:v0.5.0 image: rancher/dapper:v0.6.0
commands: commands:
- DOCKER_BUILDKIT=1 docker build --target test-e2e -t test-e2e -f Dockerfile.test . - DOCKER_BUILDKIT=1 docker build --target test-e2e -t test-e2e -f Dockerfile.test .
- SKIP_VALIDATE=true SKIP_AIRGAP=true GOCOVER=1 dapper ci - SKIP_VALIDATE=true SKIP_AIRGAP=true GOCOVER=1 dapper ci
......
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