Skip to content

Commit

Permalink
Merge pull request #24334 from redpanda-data/DEVPROD-2419-retries
Browse files Browse the repository at this point in the history
tests/docker: increase cargo retry and verbosity
  • Loading branch information
andrewhsu authored Nov 27, 2024
2 parents 223e84c + bf892a9 commit c441445
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 6 deletions.
8 changes: 4 additions & 4 deletions tests/docker/Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the License for the specific language governing permissions and
# limitations under the License.
FROM public.ecr.aws/docker/library/ubuntu:jammy-20230816 AS base
FROM public.ecr.aws/docker/library/ubuntu:jammy-20240911.1 AS base

ENV TZ="UTC" \
DEBIAN_FRONTEND=noninteractive
Expand Down Expand Up @@ -241,20 +241,20 @@ COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/polaris /
RUN /polaris && rm /polaris
#################################

FROM base as iceberg-rest
FROM base AS iceberg-rest
COPY --chown=0:0 tests/java/iceberg-rest-catalog /opt/redpanda-tests/java/iceberg-rest-catalog
COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/iceberg-rest-catalog /
RUN /iceberg-rest-catalog && rm /iceberg-rest-catalog

#################################

FROM base as trino
FROM base AS trino
COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/trino /
RUN /trino && rm /trino

#################################

FROM base as spark
FROM base AS spark
COPY --chown=0:0 tests/java/spark-iceberg-dependencies /opt/redpanda-tests/java/spark-iceberg-dependencies
COPY --chown=0:0 --chmod=0755 tests/docker/ducktape-deps/spark /
RUN /spark && rm /spark
Expand Down
2 changes: 1 addition & 1 deletion tests/docker/ducktape-deps/client-swarm
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ git clone https://github.com/redpanda-data/client-swarm.git

pushd client-swarm
git reset --hard 7ba96b8a78717c03392a3959a31e3c5a36cda472
cargo build --release
cargo build --config 'term.verbose=true' --config 'net.retry=6' --release
cp target/release/client-swarm /usr/local/bin
popd

Expand Down
2 changes: 1 addition & 1 deletion tests/docker/ducktape-deps/rp-storage-tool
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,6 @@ set -e
set -x

cd /rp_storage_tool
cargo build --release
cargo build --config 'term.verbose=true' --config 'net.retry=6' --release
cp target/release/rp-storage-tool /usr/local/bin
cd /

0 comments on commit c441445

Please sign in to comment.