Skip to content

Commit

Permalink
Merge pull request #4443 from cyclinder/fix_ci3
Browse files Browse the repository at this point in the history
CI: use merge-multiple for download-artifact
  • Loading branch information
weizhoublue authored Dec 26, 2024
2 parents 3b185f0 + 9d7a5d9 commit a63220f
Show file tree
Hide file tree
Showing 6 changed files with 13 additions and 35 deletions.
23 changes: 6 additions & 17 deletions .github/workflows/auto-upgrade-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -208,19 +208,13 @@ jobs:
run: |
bash ./test/scripts/install-tools.sh
- name: Download old spiderpool-agent image with tag ${{ needs.call_build_old_ci_image.outputs.imageTag }}
- name: Download old spiderpool-agent and spiderpool-controller image with tag ${{ needs.call_build_old_ci_image.outputs.imageTag }}
if: ${{ needs.get_ref.outputs.build_old_image_tag == 'true' }}
uses: actions/[email protected]
with:
path: test/.download
pattern: old-image-tar-spiderpool-agent-${{ needs.call_build_old_ci_image.outputs.imageTag }}

- name: Download old spiderpool-controller image with tag ${{ needs.call_build_old_ci_image.outputs.imageTag }}
if: ${{ needs.get_ref.outputs.build_old_image_tag == 'true' }}
uses: actions/[email protected]
with:
path: test/.download
pattern: old-image-tar-spiderpool-controller-${{ needs.call_build_old_ci_image.outputs.imageTag }}
merge-multiple: true
pattern: old-image-tar-spiderpool-*-${{ needs.call_build_old_ci_image.outputs.imageTag }}

- name: Load Images
if: ${{ needs.get_ref.outputs.build_old_image_tag == 'true' }}
Expand Down Expand Up @@ -303,17 +297,12 @@ jobs:
mkdir -p ${{ env.KUBECONFIG_PATH }}/${{ env.E2E_CLUSTER_NAME }}/.kube/
cp -r /tmp/config ${{ env.KUBECONFIG_PATH }}/${{ env.E2E_CLUSTER_NAME }}/.kube/config
- name: Download new spiderpool-agent image with tag ${{ needs.call_build_new_ci_image.outputs.imageTag }}
uses: actions/[email protected]
with:
path: test/.download
pattern: new-image-tar-spiderpool-agent-${{ needs.call_build_old_ci_image.outputs.imageTag }}

- name: Download new spiderpool-controller image with tag ${{ needs.call_build_new_ci_image.outputs.imageTag }}
- name: Download new spiderpool-agent and spiderpool-controller image with tag ${{ needs.call_build_new_ci_image.outputs.imageTag }}
uses: actions/[email protected]
with:
path: test/.download
pattern: new-image-tar-spiderpool-controller-${{ needs.call_build_old_ci_image.outputs.imageTag }}
pattern: new-image-tar-spiderpool-*-${{ needs.call_build_new_ci_image.outputs.imageTag }}
merge-multiple: true

- name: Load Images with tag ${{ needs.call_build_new_ci_image.outputs.imageTag }}
run: |
Expand Down
9 changes: 2 additions & 7 deletions .github/workflows/build-image-ci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,9 @@ jobs:
- name: Download digests of all images built
uses: actions/[email protected]
with:
pattern: image-digest-spiderpool-agent-*
path: image-digest/

- name: Download digests of all images built
uses: actions/[email protected]
with:
pattern: image-digest-spiderpool-controller-*
pattern: image-digest-spiderpool-*-${{ needs.build_and_push_prs.outputs.imageTag }}
path: image-digest/
merge-multiple: true

- name: Image Digests Output
shell: bash
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/build-image-plugins.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -151,7 +151,7 @@ jobs:
uses: actions/[email protected]
with:
path: image-digest/
pattern: image-digest-*
pattern: image-digest-${{ env.IMAGE_NAME }}-*
merge-multiple: true

- name: Image Digests Output
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/call-release-changelog.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ jobs:
- name: Download Artifact
uses: actions/[email protected]
with:
pattern: changelog_artifact_${{ env.RUN_dest_tag }}
pattern: changelog_artifact_${{ needs.generate_changelog.outputs.dest_tag }}
path: ${{ env.DEST_DIRECTORY }}

- uses: crazy-max/ghaction-import-gpg@v6
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/call-release-doc.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ jobs:
- name: Download Artifact
uses: actions/[email protected]
with:
pattern: website_package_artifact_${{ env.REF }}
pattern: website_package_artifact_${{ needs.release_doc.outputs.ref }}
path: ./
merge-multiple: true

Expand Down
10 changes: 2 additions & 8 deletions .github/workflows/trivy-scan-image.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,16 +23,10 @@ jobs:
persist-credentials: false
ref: ${{ inputs.ref }}

- name: Download spiderpool-agent image
- name: Download spiderpool-agent and spiderpool-controller image
uses: actions/[email protected]
with:
name: image-tar-spiderpool-agent-${{ inputs.ref }}
path: test/.download

- name: Download spiderpool-controller image
uses: actions/[email protected]
with:
name: image-tar-spiderpool-controller-${{ inputs.ref }}
name: image-tar-spiderpool-*-${{ inputs.ref }}
path: test/.download

- name: List downloaded files
Expand Down

0 comments on commit a63220f

Please sign in to comment.