From 6b465edc351e24e97f0047cd18a67b7889e307d5 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Mon, 25 Nov 2024 16:42:49 -0600 Subject: [PATCH 1/2] ducktape: fix download of redpanda-data/ocsf-schema Got errors for downloading the v1.0.0 tar.gz asset. Looks like the release for v1.0.0 does not have a tag but is just a release from the git commit from tip of v1.0.0 branch. So, change download of asset to just the code at that git commit. (cherry picked from commit ff094cb70295094a6c9375a71307cdeee8f7e05b) --- tests/docker/ducktape-deps/ocsf-server | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/ducktape-deps/ocsf-server b/tests/docker/ducktape-deps/ocsf-server index 7ab3da1252902..290b483c205a2 100644 --- a/tests/docker/ducktape-deps/ocsf-server +++ b/tests/docker/ducktape-deps/ocsf-server @@ -1,10 +1,10 @@ #!/usr/bin/env bash set -e -OCSF_SCHEMA_VERSION=1.0.0 +OCSF_SCHEMA_VERSION=9608805fe0b61035cb821bb9068096fe47fed12d # tip of v1.0.0 branch OCSF_SERVER_VERSION=d3b26de39df9eb33c6d63e34a126c77c0811c7a0 -wget "https://github.com/redpanda-data/ocsf-schema/archive/refs/tags/v${OCSF_SCHEMA_VERSION}.tar.gz" +wget "https://github.com/redpanda-data/ocsf-schema/archive/${OCSF_SCHEMA_VERSION}.tar.gz" wget "https://github.com/redpanda-data/ocsf-server/archive/${OCSF_SERVER_VERSION}.tar.gz" tar -xvzf v${OCSF_SCHEMA_VERSION}.tar.gz From 729e884f0c8fad7da356f64accc4b35d5464ac19 Mon Sep 17 00:00:00 2001 From: Andrew Hsu Date: Mon, 25 Nov 2024 23:14:55 -0600 Subject: [PATCH 2/2] ducktape: follow-up fix download of redpanda-data/ocsf-schema Use correct name for tar file. (cherry picked from commit 5b1d3770e4cc2df96bf34cc4683bfecf7e562a75) --- tests/docker/ducktape-deps/ocsf-server | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/docker/ducktape-deps/ocsf-server b/tests/docker/ducktape-deps/ocsf-server index 290b483c205a2..1ecfdd245985f 100644 --- a/tests/docker/ducktape-deps/ocsf-server +++ b/tests/docker/ducktape-deps/ocsf-server @@ -7,8 +7,8 @@ OCSF_SERVER_VERSION=d3b26de39df9eb33c6d63e34a126c77c0811c7a0 wget "https://github.com/redpanda-data/ocsf-schema/archive/${OCSF_SCHEMA_VERSION}.tar.gz" wget "https://github.com/redpanda-data/ocsf-server/archive/${OCSF_SERVER_VERSION}.tar.gz" -tar -xvzf v${OCSF_SCHEMA_VERSION}.tar.gz -rm v${OCSF_SCHEMA_VERSION}.tar.gz +tar -xvzf ${OCSF_SCHEMA_VERSION}.tar.gz +rm ${OCSF_SCHEMA_VERSION}.tar.gz mv ocsf-schema-${OCSF_SCHEMA_VERSION} /opt/ocsf-schema tar -xvzf ${OCSF_SERVER_VERSION}.tar.gz