Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

tests/docker: increase cargo retry and verbosity #24334

Merged
merged 6 commits into from
Nov 27, 2024
Merged

tests/docker: increase cargo retry and verbosity #24334

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
8fd3f60
tests/docker: fix captialization warn on docker build
andrewhsu Nov 27, 2024
9aba27d
tests/docker: update base image to latest ubuntu jammy
andrewhsu Nov 27, 2024
fe1084f
tests/docker: verbose client-swarm
andrewhsu Nov 27, 2024
6109e98
tests/docker: verbose rp-storage-tool
andrewhsu Nov 27, 2024
0c753c9
tests/docker: increase cargo retry from 3 to 6 in rp-storage-tool
andrewhsu Nov 27, 2024
bf892a9
tests/docker: increase cargo retry from 3 to 6 in client-swarm
andrewhsu Nov 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 4 additions & 4 deletions tests/docker/Dockerfile
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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 /