From f0869e899a8b22abee6b1802d1c5608462832619 Mon Sep 17 00:00:00 2001 From: Kevin O'Donnell Date: Tue, 22 Jun 2021 11:19:49 -0400 Subject: [PATCH] Switch tests and admin to use chime/stable Signed-off-by: Kevin O'Donnell --- adhoc/admin.Dockerfile | 8 ++++---- tests/sawtooth-raft-test.dockerfile | 10 +++++----- tests/test_liveness.yaml | 6 +++--- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/adhoc/admin.Dockerfile b/adhoc/admin.Dockerfile index e902073..6546699 100644 --- a/adhoc/admin.Dockerfile +++ b/adhoc/admin.Dockerfile @@ -17,15 +17,15 @@ FROM ubuntu:bionic RUN apt-get update \ && apt-get install gnupg -y -RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/apt/sources.list \ - && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \ - || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \ +RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe" >> /etc/apt/sources.list \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ curl \ inetutils-ping \ net-tools \ python3-sawtooth-cli \ - python3-sawtooth-settings \ + sawtooth-settings-tp \ && apt-get clean \ && rm -rf /var/lib/apt/lists/* diff --git a/tests/sawtooth-raft-test.dockerfile b/tests/sawtooth-raft-test.dockerfile index 7f09d68..11ac0eb 100644 --- a/tests/sawtooth-raft-test.dockerfile +++ b/tests/sawtooth-raft-test.dockerfile @@ -18,9 +18,9 @@ FROM ubuntu:bionic RUN apt-get update \ && apt-get install gnupg -y -RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/nightly bionic universe" >> /etc/apt/sources.list \ - && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 44FC67F19B2466EA \ - || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 44FC67F19B2466EA) \ +RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/chime/stable bionic universe" >> /etc/apt/sources.list \ + && (apt-key adv --keyserver hkp://keyserver.ubuntu.com:80 --recv-keys 8AA7AF1F1091A5FD \ + || apt-key adv --keyserver hkp://p80.pool.sks-keyservers.net:80 --recv-keys 8AA7AF1F1091A5FD) \ && apt-get update \ && apt-get install -y -q --allow-downgrades \ apt-transport-https \ @@ -33,12 +33,12 @@ RUN echo "deb [arch=amd64] http://repo.sawtooth.me/ubuntu/nightly bionic univers python3 \ python3-sawtooth-cli \ python3-sawtooth-rest-api \ - python3-sawtooth-settings \ python3-sawtooth-validator \ python3-requests \ python3-nose2 \ + sawtooth-settings-tp \ sawtooth-smallbank-workload \ - sawtooth-smallbank-tp-rust \ + sawtooth-smallbank-tp-go \ software-properties-common \ unzip \ # Install docker diff --git a/tests/test_liveness.yaml b/tests/test_liveness.yaml index b0dd009..cdaa95b 100644 --- a/tests/test_liveness.yaml +++ b/tests/test_liveness.yaml @@ -213,7 +213,7 @@ services: dockerfile: sawtooth-raft-test.dockerfile expose: - 4004 - command: smallbank-tp-rust -C tcp://validator-1:4004 + command: smallbank-tp-go -C tcp://validator-1:4004 --max-queue-size 1024 --worker-thread-count 32 stop_signal: SIGKILL smallbank-tp-2: @@ -223,7 +223,7 @@ services: dockerfile: sawtooth-raft-test.dockerfile expose: - 4004 - command: smallbank-tp-rust -C tcp://validator-2:4004 + command: smallbank-tp-go -C tcp://validator-2:4004 --max-queue-size 1024 --worker-thread-count 32 stop_signal: SIGKILL smallbank-tp-3: @@ -233,7 +233,7 @@ services: dockerfile: sawtooth-raft-test.dockerfile expose: - 4004 - command: smallbank-tp-rust -C tcp://validator-3:4004 + command: smallbank-tp-go -C tcp://validator-3:4004 --max-queue-size 1024 --worker-thread-count 32 stop_signal: SIGKILL settings-tp-1: