From 0a1bc384f33ba7650e5254cbc817fad644f4ffeb Mon Sep 17 00:00:00 2001
From: lb584 <lb584@cam.ac.uk>
Date: Thu, 21 Dec 2023 17:29:53 +0000
Subject: [PATCH] swapping test dates back
---
configs/docker/build/Dockerfile | 6 +++---
tests/integration/partial/test_advisory.py | 2 +-
tests/integration/partial/test_deposition.py | 2 +-
tests/integration/partial/test_env_suit.py | 2 +-
tests/integration/partial/test_epi.py | 2 +-
tests/integration/partial/test_survey.py | 2 +-
6 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile
index 651bc44..21318bd 100644
--- a/configs/docker/build/Dockerfile
+++ b/configs/docker/build/Dockerfile
@@ -10,7 +10,7 @@ WORKDIR /home
#RUN mkdir /home/ewsmanager/code
#copy resources in
-COPY ./conda-env-py3EWS-withbuilds.yml .
+COPY ./conda-env-py3EWS-nobuilds.yml .
#install system packages
RUN apt-get update;apt-get install --assume-yes wget unzip emacs gdal-bin libgdal-dev build-essential gfortran zlib1g zlib1g-dev libbz2-dev apt-utils liblzma-dev libpcre++-dev libcurl4-openssl-dev default-jre lib32readline7 lib32readline6-dev openssh-server libfribidi-dev libfontconfig1-dev git;
@@ -29,10 +29,10 @@ RUN wget --quiet https://repo.anaconda.com/miniconda/Miniconda3-latest-Linux-x86
ENV PATH=$CONDA_DIR/bin:$PATH
#build the conda env(s)
-RUN conda env create --file conda-env-py3EWS-withbuilds.yml --prefix /storage/app/EWS_prod/envs/conda/py3EWS
+RUN conda env create --file conda-env-py3EWS-nobuilds.yml --prefix /storage/app/EWS_prod/envs/conda/py3EWS
#tidy
-RUN rm -v conda-env-py3EWS-withbuilds.yml;
+RUN rm -v conda-env-py3EWS-nobuilds.yml;
#these usernames and ids match the production server (IaaS), override when building a local image if needed
ARG GNAME=ews
diff --git a/tests/integration/partial/test_advisory.py b/tests/integration/partial/test_advisory.py
index bdfe984..d8558cd 100644
--- a/tests/integration/partial/test_advisory.py
+++ b/tests/integration/partial/test_advisory.py
@@ -18,7 +18,7 @@ class TestAdvisory(BaseAdvisoryTestSuite.AdvisoryTestSuite):
IntegrationTestUtils.TEST_OUT_PATH = None
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = '20231127'
+ IntegrationTestUtils.TEST_START_DATE = '20221001'
IntegrationTestUtils.TEST_JOB_DIR = "ADVISORY_" + IntegrationTestUtils.TEST_START_DATE
self.EXPECTED_EA_IMAGE_COUNT = 6
self.EXPECTED_ETH_IMAGE_COUNT = 6
diff --git a/tests/integration/partial/test_deposition.py b/tests/integration/partial/test_deposition.py
index 8e665e4..96268cb 100644
--- a/tests/integration/partial/test_deposition.py
+++ b/tests/integration/partial/test_deposition.py
@@ -19,7 +19,7 @@ class TestDeposition(BaseDepoTestSuite.DepoTestSuite):
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = "20231127"
+ IntegrationTestUtils.TEST_START_DATE = "20221001"
IntegrationTestUtils.TEST_JOB_DIR = "DEPOSITION_" + IntegrationTestUtils.TEST_START_DATE
self.EA_CSV_COUNT = 9
diff --git a/tests/integration/partial/test_env_suit.py b/tests/integration/partial/test_env_suit.py
index 55c7d82..843556a 100644
--- a/tests/integration/partial/test_env_suit.py
+++ b/tests/integration/partial/test_env_suit.py
@@ -18,7 +18,7 @@ class TestEnvSuit(BaseEnvSuitTestSuite.EnvSuitTestSuite):
IntegrationTestUtils.TEST_OUT_PATH = None
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = "20231127"
+ IntegrationTestUtils.TEST_START_DATE = "20221001"
IntegrationTestUtils.TEST_JOB_DIR = "ENVIRONMENT_2.0_" + IntegrationTestUtils.TEST_START_DATE
self.EA_CSV_COUNT = 18
diff --git a/tests/integration/partial/test_epi.py b/tests/integration/partial/test_epi.py
index 5922cf2..a5433b9 100644
--- a/tests/integration/partial/test_epi.py
+++ b/tests/integration/partial/test_epi.py
@@ -18,7 +18,7 @@ class TestEpi(BaseEpiTestSuite.EpiTestSuite):
def set_expected_values(self):
super().set_expected_values()
- IntegrationTestUtils.TEST_START_DATE = '20231127'
+ IntegrationTestUtils.TEST_START_DATE = '20221001'
IntegrationTestUtils.TEST_JOB_DIR = "EPI_" + IntegrationTestUtils.TEST_START_DATE
diff --git a/tests/integration/partial/test_survey.py b/tests/integration/partial/test_survey.py
index 1c33aff..0026f52 100644
--- a/tests/integration/partial/test_survey.py
+++ b/tests/integration/partial/test_survey.py
@@ -18,7 +18,7 @@ class TestSurvey(BaseSurveyTestSuite.SurveyTestSuite):
IntegrationTestUtils.TEST_OUT_PATH = None
def set_expected_values(self):
- IntegrationTestUtils.TEST_START_DATE = '20231127'
+ IntegrationTestUtils.TEST_START_DATE = '20221001'
IntegrationTestUtils.TEST_JOB_DIR = "SURVEYDATA_" + IntegrationTestUtils.TEST_START_DATE
--
GitLab