diff --git a/configs/docker/build/Dockerfile b/configs/docker/build/Dockerfile index 651bc44e497b9574208b4b4c9ba5689ff6435b21..21318bd51e75b65fe089069c5f62a3cac46684a8 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 bdfe984c55f76fb9d6520fb42dcfa4b67d8ab3f0..d8558cd7459895a0e0508f9fbc671c9225b5861c 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 8e665e40b23b6f2b9ceb3b19e6c3d1341098abee..96268cb9510e7a6d5fc71c4f0474a43b622d139f 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 55c7d82ebec9ac2abf9ccf0727f5f62a9cc06f80..843556a46f285d9c7ea66d71ed99b1a94bf6be38 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 5922cf2373c1ff0a13a3dc998dc450eba46114c1..a5433b9a0842265cd62a8d8437f58888cc563ed7 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 1c33aff12646b9f061c3df744e785fac48f4186b..0026f5206ed6771858d74b04ef95f4888b1fda53 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