diff --git a/tezt/lib_cloud/dockerfiles/saroupille.Dockerfile b/tezt/lib_cloud/dockerfiles/saroupille.Dockerfile index 2577ed5009411a924dfa03b62aa306e193238c7d..708c8aabfe891f793e4cbaa22d32b171eb37222c 100644 --- a/tezt/lib_cloud/dockerfiles/saroupille.Dockerfile +++ b/tezt/lib_cloud/dockerfiles/saroupille.Dockerfile @@ -1,7 +1,9 @@ # When copying this image, feel free to change to debian:stable if you # encounter any dependency issue -FROM debian:sid as raw +FROM debian:sid AS raw +# ignore "Pin versions in apt get install" hadolint warning +# hadolint ignore=DL3008 RUN apt-get update && apt-get install -y \ # netbase is needed to handle transport services netbase \ @@ -15,14 +17,16 @@ RUN apt-get update && apt-get install -y \ libpq-dev \ # Dependencies needed for tezt-cloud docker.io docker-cli screen file \ - # iproute2 installs traffic control tooling + # iproute2 installs traffic control tooling iproute2 \ - # emacs can be useful for debugging + # emacs can be useful for debugging emacs \ - # wget can be used to import snapshots + # wget can be used to import snapshots wget \ # Necessary certificates for mirages dependencies ca-certificates \ + # jq is useful for pretty-printing json + jq \ # DL3015: Use --no-install-recommends --no-install-recommends && \ # DL3009: Delete the apt-get lists after Installing @@ -48,7 +52,7 @@ COPY $DAL_TRUSTED_SETUP_PATH /usr/local/share/dal-trusted-setup CMD ["-D", "-p", "30000", "-e"] ENTRYPOINT ["/usr/sbin/sshd"] -FROM raw as full +FROM raw AS full # Path where binaries should be stored on the docker container ARG BINARIES_DESTINATION_PATH COPY ./octez-node $BINARIES_DESTINATION_PATH/octez-node diff --git a/tezt/tests/cloud/dal.ml b/tezt/tests/cloud/dal.ml index 68a7f0c3750fa24f0faa8c162e3c22867ac04500..af3d3d12ea35299abeb9ab845107c70f83eeb791 100644 --- a/tezt/tests/cloud/dal.ml +++ b/tezt/tests/cloud/dal.ml @@ -111,7 +111,7 @@ module Network = struct let default_bootstrap = function | Ghostnet -> "ghostnet.tzinit.org" (* Taken from ghostnet configuration *) - | Weeklynet date -> sf "weeklynet-%s.tzinit.org" date + | Weeklynet date -> sf "weeklynet-%s.teztnets.com" date let default_dal_bootstrap = function | Ghostnet -> @@ -1894,7 +1894,6 @@ let init ~(configuration : configuration) cloud next_agent = let bootstrap_agent = Option.get bootstrap_agent in init_sandbox_and_activate_protocol cloud configuration bootstrap_agent | Testnet testnet -> - let () = toplog "Init: initializting, testnet case" in init_testnet cloud configuration teztale bootstrap_agent testnet in let* bakers = @@ -2263,7 +2262,6 @@ let benchmark () = let* () = set_name agent name in Lwt.return agent in - toplog "Init" ; let* t = init ~configuration cloud next_agent in toplog "Starting main loop" ; let main_loop = loop t (t.first_level + 1) in