From 3c3ed2748278e51c3a84d56af686c3ca4f209551 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 17 Oct 2022 10:14:22 +0900 Subject: [PATCH 1/7] ARROW-18071: [Dev][Archery][Crossbow] Show body from server on upload error https://app.travis-ci.com/github/ursacomputing/crossbow/builds/256719193#L8074 failed with: curl: (22) The requested URL returned error: 422 It's helpful if we get more details on error. --- dev/archery/archery/crossbow/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py index c8ea8a13a4b..cde8335b6c5 100644 --- a/dev/archery/archery/crossbow/core.py +++ b/dev/archery/archery/crossbow/core.py @@ -495,7 +495,7 @@ def github_upload_asset_curl(self, release, path, name, mime): command = [ 'curl', - '--fail', + '--fail-with-body', '-H', "Authorization: token {}".format(self.github_token), '-H', "Content-Type: {}".format(mime), '--data-binary', '@{}'.format(path), From 8cf1abcb832030033fcc84db4b47659e13bb64db Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 17 Oct 2022 13:54:47 +0900 Subject: [PATCH 2/7] Use Jammy for newer curl --- .travis.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.travis.yml b/.travis.yml index a15822b4a74..9766601081f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -dist: focal +dist: jammy language: minimal From 7fd8866ba78f4056d7ff80e5b32b1aaf8f29a0e7 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Mon, 17 Oct 2022 14:57:19 +0900 Subject: [PATCH 3/7] Use Jammy --- .travis.yml | 2 +- dev/tasks/linux-packages/travis.linux.arm64.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 9766601081f..a15822b4a74 100644 --- a/.travis.yml +++ b/.travis.yml @@ -15,7 +15,7 @@ # specific language governing permissions and limitations # under the License. -dist: jammy +dist: focal language: minimal diff --git a/dev/tasks/linux-packages/travis.linux.arm64.yml b/dev/tasks/linux-packages/travis.linux.arm64.yml index bc2311a33d6..a38658fbee0 100644 --- a/dev/tasks/linux-packages/travis.linux.arm64.yml +++ b/dev/tasks/linux-packages/travis.linux.arm64.yml @@ -20,7 +20,7 @@ arch: arm64-graviton2 virt: vm os: linux -dist: focal +dist: jammy group: edge language: minimal From 87285a2b6e0e93a4ab1878ff64a6496c432a0589 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 18 Oct 2022 14:16:21 +0900 Subject: [PATCH 4/7] Disable --fail temporary --- dev/archery/archery/crossbow/core.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py index cde8335b6c5..967573bcbee 100644 --- a/dev/archery/archery/crossbow/core.py +++ b/dev/archery/archery/crossbow/core.py @@ -495,7 +495,7 @@ def github_upload_asset_curl(self, release, path, name, mime): command = [ 'curl', - '--fail-with-body', + # '--fail-with-body', '-H', "Authorization: token {}".format(self.github_token), '-H', "Content-Type: {}".format(mime), '--data-binary', '@{}'.format(path), From 0d1f676c25489f729ff7ce269b9cd5c5a7d16b7c Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Tue, 18 Oct 2022 15:48:24 +0900 Subject: [PATCH 5/7] Use requests on Travis CI --- dev/archery/archery/crossbow/core.py | 2 +- dev/tasks/linux-packages/travis.linux.arm64.yml | 2 +- dev/tasks/macros.jinja | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py index 967573bcbee..c8ea8a13a4b 100644 --- a/dev/archery/archery/crossbow/core.py +++ b/dev/archery/archery/crossbow/core.py @@ -495,7 +495,7 @@ def github_upload_asset_curl(self, release, path, name, mime): command = [ 'curl', - # '--fail-with-body', + '--fail', '-H', "Authorization: token {}".format(self.github_token), '-H', "Content-Type: {}".format(mime), '--data-binary', '@{}'.format(path), diff --git a/dev/tasks/linux-packages/travis.linux.arm64.yml b/dev/tasks/linux-packages/travis.linux.arm64.yml index a38658fbee0..bc2311a33d6 100644 --- a/dev/tasks/linux-packages/travis.linux.arm64.yml +++ b/dev/tasks/linux-packages/travis.linux.arm64.yml @@ -20,7 +20,7 @@ arch: arm64-graviton2 virt: vm os: linux -dist: jammy +dist: focal group: edge language: minimal diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index 3bec472bcf6..6f2275e3028 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -194,6 +194,7 @@ on: --queue-path $(pwd) \ --queue-remote {{ queue_remote_url }} \ upload-artifacts \ + --method requests \ --sha {{ task.branch }} \ --tag {{ task.tag }} \ {% if pattern is string %} From 0a5fb4d1aec12f6c0090a993e1ef2bdc89206468 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Wed, 19 Oct 2022 09:12:37 +0900 Subject: [PATCH 6/7] Debug print --- dev/archery/archery/crossbow/core.py | 4 ++-- dev/tasks/macros.jinja | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/dev/archery/archery/crossbow/core.py b/dev/archery/archery/crossbow/core.py index c8ea8a13a4b..43c993e0bdc 100644 --- a/dev/archery/archery/crossbow/core.py +++ b/dev/archery/archery/crossbow/core.py @@ -531,8 +531,8 @@ def github_overwrite_release_assets(self, tag_name, target_commitish, mime = mimetypes.guess_type(name)[0] or 'application/zip' logger.info( - 'Uploading asset `{}` with mimetype {} and size {}...' - .format(name, mime, size) + 'Uploading asset `{}` ({})({}) with mimetype {} and size {}...' + .format(name, path, pattern, mime, size) ) if method == 'requests': diff --git a/dev/tasks/macros.jinja b/dev/tasks/macros.jinja index 6f2275e3028..3bec472bcf6 100644 --- a/dev/tasks/macros.jinja +++ b/dev/tasks/macros.jinja @@ -194,7 +194,6 @@ on: --queue-path $(pwd) \ --queue-remote {{ queue_remote_url }} \ upload-artifacts \ - --method requests \ --sha {{ task.branch }} \ --tag {{ task.tag }} \ {% if pattern is string %} From 21dc8c68f830baf358238bf2f3a718310b652fd9 Mon Sep 17 00:00:00 2001 From: Sutou Kouhei Date: Thu, 20 Oct 2022 06:00:17 +0900 Subject: [PATCH 7/7] Restrict prefix --- dev/tasks/linux-packages/github.linux.amd64.yml | 2 +- dev/tasks/linux-packages/travis.linux.arm64.yml | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/dev/tasks/linux-packages/github.linux.amd64.yml b/dev/tasks/linux-packages/github.linux.amd64.yml index f252a081d67..aefcc7ecfc1 100644 --- a/dev/tasks/linux-packages/github.linux.amd64.yml +++ b/dev/tasks/linux-packages/github.linux.amd64.yml @@ -103,5 +103,5 @@ jobs: ARROW_VERSION: {{ arrow.version }} YUM_TARGETS: {{ target }} - {% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/**/*{}") %} + {% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/*/*/repositories/**/*{}") %} {{ macros.github_upload_releases(patterns)|indent }} diff --git a/dev/tasks/linux-packages/travis.linux.arm64.yml b/dev/tasks/linux-packages/travis.linux.arm64.yml index bc2311a33d6..f3ec4f1de2b 100644 --- a/dev/tasks/linux-packages/travis.linux.arm64.yml +++ b/dev/tasks/linux-packages/travis.linux.arm64.yml @@ -160,5 +160,5 @@ script: - popd after_success: - {% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/**/*{}") %} + {% set patterns = upload_extensions | format_all("arrow/dev/tasks/linux-packages/*/*/repositories/**/*{}") %} {{ macros.travis_upload_releases(patterns) }}