-
Notifications
You must be signed in to change notification settings - Fork 82
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #4443 from cyclinder/fix_ci3
CI: use merge-multiple for download-artifact
- Loading branch information
Showing
6 changed files
with
13 additions
and
35 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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' }} | ||
|
@@ -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: | | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -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 | ||
|