Migrate regression tests' default environment. (#62)

nasa · May 25, 2023 · db5e2fe · db5e2fe
1 parent 3f60004
commit db5e2fe
Show file tree

Hide file tree

Showing 21 changed files with 26 additions and 25 deletions.
diff --git a/README.md b/README.md
@@ -64,9 +64,10 @@ To run the tests:
 use the environment.yml of the test to [create the environment with
 conda](https://conda.io/projects/conda/en/latest/user-guide/tasks/manage-environments.html#creating-an-environment-from-an-environment-yml-file)
 or you can create the environment with another virtual env, just ensure all of
-the requirement from the environment.yml file are installed. (Be careful, This
-will always create a conda environment named papermill, so delete any existing
-environment before installing from the environment.yml).
+the requirement from the environment.yml file are installed. They will create
+conda environments named `papermill-<image>`, and you should delete any existing
+environment before installing from the environment.yml.
+
 1. Start the jupyter server: `jupyter notebook`.
 1. Browse and open the jupyter notebook file for the test. (`<image>_Regression.ipynb`)
 1. Update the `harmony_host_url` in the notebook.
@@ -90,7 +91,7 @@ For example, in the `harmony` directory we have
  subdirectory. The `name` field in the file should be `papermill`. For example:
 
  ```yaml
-name: papermill
+name: papermill-<IMAGE>
 channels:
   - conda-forge
   - defaults

diff --git a/test/harmony-regression/HarmonyRegression.ipynb b/test/harmony-regression/HarmonyRegression.ipynb
@@ -9,9 +9,9 @@
     "\n",
     "## Prerequisites\n",
     "\n",
-    " The dependencies for this notebook are listed in the [environment.yaml](./environment.yaml). To test or install locally, create the papermill environment used in the automated regression testing suite: \n",
+    " The dependencies for this notebook are listed in the [environment.yaml](./environment.yaml). To test or install locally, create the papermill-<IMAGE> environment used in the automated regression testing suite: \n",
     "\n",
-    "`conda env create -f ./environment.yaml && conda activate papermill`\n",
+    "`conda env create -f ./environment.yaml && conda activate papermill-<IMAGE>`\n",
     "\n",
     "Also ensure you have a `.netrc` file located in the `test` directory of this repository."
    ]

diff --git a/test/harmony-regression/environment.yaml b/test/harmony-regression/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-harmony-regression
 channels:
   - conda-forge
   - defaults

diff --git a/test/harmony-regression/version.txt b/test/harmony-regression/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/harmony/environment.yaml b/test/harmony/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-harmony
 channels:
   - conda-forge
   - defaults

diff --git a/test/harmony/version.txt b/test/harmony/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/hga/environment.yaml b/test/hga/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-hga
 channels:
   - conda-forge
   - defaults

diff --git a/test/hga/version.txt b/test/hga/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/hoss/environment.yaml b/test/hoss/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-hoss
 channels:
   - conda-forge
   - defaults

diff --git a/test/hoss/version.txt b/test/hoss/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/n2z/environment.yaml b/test/n2z/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-n2z
 channels:
   - conda-forge
   - defaults

diff --git a/test/n2z/version.txt b/test/n2z/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/notebook-entrypoint.sh b/test/notebook-entrypoint.sh
@@ -1,7 +1,7 @@
 #!/bin/bash
 # script to act as the entrypoint for running harmony regression tests in their containers.
 
-export PATH=/opt/conda/envs/papermill/bin:$PATH
+export PATH=/opt/conda/envs/papermill-${env_sub_dir}/bin:$PATH
 
 /bin/bash /workdir/build-netrc.sh
 

diff --git a/test/regridder/environment.yaml b/test/regridder/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-regridder
 channels:
   - conda-forge
   - defaults

diff --git a/test/regridder/version.txt b/test/regridder/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/swath-projector/environment.yaml b/test/swath-projector/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-swath-projector
 channels:
   - conda-forge
   - defaults

diff --git a/test/swath-projector/version.txt b/test/swath-projector/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/trajectory-subsetter/environment.yaml b/test/trajectory-subsetter/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-trajectory-subsetter
 channels:
   - conda-forge
   - defaults

diff --git a/test/trajectory-subsetter/version.txt b/test/trajectory-subsetter/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3
diff --git a/test/variable-subsetter/environment.yaml b/test/variable-subsetter/environment.yaml
@@ -1,4 +1,4 @@
-name: papermill
+name: papermill-variable-subsetter
 channels:
   - conda-forge
   - defaults

diff --git a/test/variable-subsetter/version.txt b/test/variable-subsetter/version.txt
@@ -1 +1 @@
-0.1.2
+0.1.3