From f32ecd9aa24e92b87cd85c354498dfaba1f07822 Mon Sep 17 00:00:00 2001 From: Lawrence Nahum Date: Sat, 1 Jun 2024 01:25:36 +0200 Subject: [PATCH] tests: remove pin oracle tests are they are run in the pin oracle repo --- .dockerignore | 1 - Dockerfile | 3 +-- ci_flash.sh | 12 +----------- 3 files changed, 2 insertions(+), 14 deletions(-) diff --git a/.dockerignore b/.dockerignore index 9c270de0..6ea31097 100644 --- a/.dockerignore +++ b/.dockerignore @@ -1,4 +1,3 @@ ** !requirements.txt -!pinserver/requirements.txt !.git diff --git a/Dockerfile b/Dockerfile index d2567fea..f37b6faf 100644 --- a/Dockerfile +++ b/Dockerfile @@ -30,6 +30,5 @@ RUN cd qemu && ./configure --target-list=xtensa-softmmu --prefix=/opt \ FROM esp-idf COPY --from=esp-qemu /opt /opt COPY requirements.txt / -COPY pinserver/requirements.txt /ps_requirements.txt SHELL ["/bin/bash", "-c"] -RUN virtualenv -p python3 /venv && source /venv/bin/activate && pip install --require-hashes -r /requirements.txt -r /ps_requirements.txt +RUN virtualenv -p python3 /venv && source /venv/bin/activate && pip install --require-hashes -r /requirements.txt diff --git a/ci_flash.sh b/ci_flash.sh index e6a82da2..23586826 100755 --- a/ci_flash.sh +++ b/ci_flash.sh @@ -32,17 +32,7 @@ sleep 1 source ~/venv3/bin/activate -pip install --require-hashes -r requirements.txt -r pinserver/requirements.txt - -SESSION_LIFETIME="${PINSVR_SESSION_TIMEOUT}" PINSERVER_PORT="${PINSVRPORT}" python -m unittest -v - -if command -v redis-server &> /dev/null -then - echo "Redis found, running tests on localhost:${REDIS_PORT}" - redis-server --port ${REDIS_PORT} & - REDIS_HEALTH_CHECK_INTERVAL=0 REDIS_SLEEP=0 REDIS_PORT=${REDIS_PORT} REDIS_HOST='localhost' SESSION_LIFETIME="${PINSVR_SESSION_TIMEOUT}" PINSERVER_PORT="${PINSVRPORT}" python -m unittest -v - redis-cli -p ${REDIS_PORT} shutdown -fi +pip install --require-hashes -r requirements.txt # NOTE: tools/fwprep.py should have run in the build step and produced the compressed firmware file FW_FULL=$(ls build/*_fw.bin)