SamuZad · SamuZad · Nov 6, 2023 · Sep 14, 2023 · Sep 13, 2023 · Sep 13, 2023
diff --git a/.drone.yml b/.drone.yml
@@ -12,7 +12,7 @@ environment:
 
 steps:
 - name: provisioning-tests-pr
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper provisioning-tests
   privileged: true
@@ -23,7 +23,8 @@ steps:
     event:
     - pull_request
 - name: provisioning-tests-push
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
+  failure: ignore
   commands:
   - dapper provisioning-tests
   privileged: true
@@ -64,7 +65,7 @@ environment:
 
 steps:
 - name: provisioning-tests-pr
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper provisioning-tests
   privileged: true
@@ -75,7 +76,8 @@ steps:
     event:
     - pull_request
 - name: provisioning-tests-push
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
+  failure: ignore
   commands:
   - dapper provisioning-tests
   privileged: true
@@ -116,7 +118,7 @@ environment:
 
 steps:
   - name: provisioning-operations-tests-pr
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - dapper provisioning-tests
     privileged: true
@@ -127,7 +129,8 @@ steps:
       event:
         - pull_request
   - name: provisioning-operations-tests-push
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
+    failure: ignore
     commands:
       - dapper provisioning-tests
     privileged: true
@@ -168,7 +171,7 @@ environment:
 
 steps:
   - name: provisioning-operations-tests-pr
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - dapper provisioning-tests
     privileged: true
@@ -179,7 +182,8 @@ steps:
       event:
         - pull_request
   - name: provisioning-operations-tests-push
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
+    failure: ignore
     commands:
       - dapper provisioning-tests
     privileged: true
@@ -216,7 +220,7 @@ platform:
 
 steps:
 - name: build-pr
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper ci
   privileged: true
@@ -228,7 +232,7 @@ steps:
     - pull_request
 
 - name: build-push-tag
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper ci
   privileged: true
@@ -248,7 +252,7 @@ steps:
     - tag
 
 - name: fossa-amd64
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   failure: ignore
   environment:
     FOSSA_API_KEY:
@@ -271,7 +275,7 @@ steps:
       - tag
 
 - name: stage-binaries
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - "cp -r ./bin/* ./package/"
   when:
@@ -461,7 +465,7 @@ steps:
       - "refs/tags/*-*"
 
 - name: check-release-images-exists
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   failure: ignore
   commands:
   - dapper check-release-images-exist
@@ -497,7 +501,7 @@ platform:
 
 steps:
 - name: build-pr
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper ci
   privileged: true
@@ -509,7 +513,7 @@ steps:
     - pull_request
 
 - name: build-push-tag
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper ci
   privileged: true
@@ -529,7 +533,7 @@ steps:
     - tag
 
 - name: stage-binaries
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - "cp -r ./bin/* ./package/"
   when:
@@ -713,7 +717,7 @@ steps:
   - git checkout $DRONE_COMMIT -b origin/$DRONE_TARGET_BRANCH
 
 - name: build-pr
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   failure: ignore
   commands:
   - dapper ci
@@ -726,7 +730,7 @@ steps:
     - pull_request
 
 - name: build-push-tag
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   failure: ignore
   commands:
   - K3S_BUILDER=k3s_root dapper ci
@@ -747,7 +751,7 @@ steps:
     - tag
 
 - name: stage-binaries
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   failure: ignore
   commands:
   - "cp -r ./bin/* ./package/"
@@ -949,7 +953,7 @@ clone:
 steps:
   - name: build-pr
     pull: always
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - dapper.exe -f Dockerfile-windows.dapper -d ci
     volumes:
@@ -961,7 +965,7 @@ steps:
 
   - name: build-push-tag
     pull: always
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - dapper.exe -f Dockerfile-windows.dapper -d ci
     volumes:
@@ -980,7 +984,7 @@ steps:
         - tag
 
   - name: stage-binaries
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - "cp -r ./bin/* ./package/windows/"
     when:
@@ -1074,7 +1078,7 @@ clone:
 steps:
   - name: build-pr
     pull: always
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - dapper.exe -f Dockerfile-windows.dapper -d ci
     volumes:
@@ -1086,7 +1090,7 @@ steps:
 
   - name: build-push-tag
     pull: always
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - dapper.exe -f Dockerfile-windows.dapper -d ci
     volumes:
@@ -1105,7 +1109,7 @@ steps:
         - tag
 
   - name: stage-binaries
-    image: rancher/dapper:v0.5.8
+    image: rancher/dapper:v0.6.0
     commands:
       - "cp -r ./bin/* ./package/windows/"
     when:
@@ -1317,7 +1321,7 @@ steps:
     - tag
 
 - name: build-chart
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper chart/ci
   privileged: true
@@ -1368,72 +1372,37 @@ depends_on:
 - default-windows-ltsc2022
 ---
 kind: pipeline
-name: docker-image-digests-linux-amd64
+name: docker-image-digests-linux
 
 platform:
   os: linux
   arch: amd64
 
 steps:
 - name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.12
-  environment:
-    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
-    PLUGIN_GITHUB_TOKEN:
-      from_secret: github_token
-    PLUGIN_GITHUB_TAG: "${DRONE_TAG}"
-    PLUGIN_INPUT_FILE: "rancher-images.txt"
-    PLUGIN_OUTPUT_FILE: "rancher-images-digests-linux-amd64.txt"
-    PLUGIN_REGISTRY: "docker.io"
+  image: rancher/dapper:v0.6.0
+  privileged: true
   volumes:
   - name: docker
     path: /var/run/docker.sock
+  commands:
+  - dapper generate-linux-digests.sh
   when:
     instance:
       include:
       - drone-publish.rancher.io
     event:
     - tag
-
-volumes:
-- name: docker
-  host:
-    path: /var/run/docker.sock
-
-trigger:
-  event:
-    exclude:
-    - promote
-    - pull_request
-
-depends_on:
-- default-linux-amd64
----
-kind: pipeline
-name: docker-image-digests-linux-arm64
-
-platform:
-  os: linux
-  arch: arm64
-
-steps:
-- name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.12
-  environment:
-    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
-    PLUGIN_GITHUB_TOKEN:
+- name: github_binary_release_digests
+  image: plugins/github-release
+  settings:
+    api_key:
       from_secret: github_token
-    PLUGIN_GITHUB_TAG: "${DRONE_TAG}"
-    PLUGIN_INPUT_FILE: "rancher-images.txt"
-    PLUGIN_OUTPUT_FILE: "rancher-images-digests-linux-arm64.txt"
-    PLUGIN_REGISTRY: "docker.io"
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
+    files:
+    - "bin/rancher-images-digests-linux-*"
   when:
     instance:
-      include:
-      - drone-publish.rancher.io
+    - drone-publish.rancher.io
     event:
     - tag
 
@@ -1451,63 +1420,6 @@ trigger:
 depends_on:
 - default-linux-amd64
 - default-linux-arm64
----
-kind: pipeline
-name: docker-image-digests-linux-s390x
-
-platform:
-  os: linux
-  arch: amd64
-
-# Hack needed for s390x: https://gist.github.com/colstrom/c2f359f72658aaabb44150ac20b16d7c#gistcomment-3858388
-node:
-  arch: s390x
-
-clone:
-  disable: true
-
-steps:
-- name: clone
-  image: alpine/git:v2.30.2-s390x
-  commands:
-  - git clone $DRONE_GIT_HTTP_URL  .
-  - git fetch origin $DRONE_COMMIT_REF
-  - git checkout $DRONE_COMMIT -b origin/$DRONE_TARGET_BRANCH
-
-- name: docker-image-digests
-  image: rancher/drone-docker-image-digests:v0.0.13
-  failure: ignore
-  environment:
-    PLUGIN_GITHUB_REPOSITORY: "rancher/rancher"
-    PLUGIN_GITHUB_TOKEN:
-      from_secret: github_token
-    PLUGIN_GITHUB_TAG: "${DRONE_TAG}"
-    PLUGIN_INPUT_FILE: "rancher-images.txt"
-    PLUGIN_OUTPUT_FILE: "rancher-images-digests-linux-s390x.txt"
-    PLUGIN_REGISTRY: "docker.io"
-  volumes:
-  - name: docker
-    path: /var/run/docker.sock
-  when:
-    instance:
-      include:
-      - drone-publish.rancher.io
-    event:
-    - tag
-
-volumes:
-- name: docker
-  host:
-    path: /var/run/docker.sock
-
-trigger:
-  event:
-    exclude:
-    - promote
-    - pull_request
-
-depends_on:
-- default-linux-amd64
 - default-linux-s390x
 ---
 kind: pipeline
@@ -1618,7 +1530,7 @@ platform:
 
 steps:
 - name: chart-promote
-  image: rancher/dapper:v0.5.8
+  image: rancher/dapper:v0.6.0
   commands:
   - dapper chart/copy
   volumes: