From 47c74c23d5a04c4a6d22276e99d0e486a9a8f151 Mon Sep 17 00:00:00 2001
From: Joseph Hunkeler <jhunkeler@gmail.com>
Date: Wed, 13 Nov 2024 00:52:52 -0500
Subject: Shorten workspace names and paths

---
 tests/data/gbo.ini              | 65 +++++++++++++++++++++++++++++++++++++++++
 tests/data/gbo.yml              |  9 ++++++
 tests/data/generic_based_on.ini | 65 -----------------------------------------
 tests/data/generic_based_on.yml |  9 ------
 tests/rt_generic_based_on.sh    |  2 +-
 tests/setup.sh                  |  2 +-
 6 files changed, 76 insertions(+), 76 deletions(-)
 create mode 100644 tests/data/gbo.ini
 create mode 100644 tests/data/gbo.yml
 delete mode 100644 tests/data/generic_based_on.ini
 delete mode 100644 tests/data/generic_based_on.yml

diff --git a/tests/data/gbo.ini b/tests/data/gbo.ini
new file mode 100644
index 0000000..c57ae8c
--- /dev/null
+++ b/tests/data/gbo.ini
@@ -0,0 +1,65 @@
+[meta]
+mission = generic
+name = GBO
+version = 1.2.3
+rc = 1
+final = false
+based_on = {{ env:TEST_DATA }}/generic_based_on.yml
+python = 3.11
+
+
+[conda]
+installer_name = Miniforge3
+installer_version = 24.3.0-0
+installer_platform = {{env:STASIS_CONDA_PLATFORM}}
+installer_arch = {{env:STASIS_CONDA_ARCH}}
+installer_baseurl = https://github.com/conda-forge/miniforge/releases/download/{{conda.installer_version}}
+;conda_packages =
+pip_packages =
+    firewatch==0.0.4
+    tweakwcs==0.8.8
+
+
+[runtime]
+CPPFLAGS = ${CPPFLAGS} -fpermissive
+PYTHONUNBUFFERED = 1
+
+
+[test:firewatch]
+repository = https://github.com/astroconda/firewatch
+script_setup =
+    pip install -e '.'
+script =
+    firewatch -c conda-forge -p ${STASIS_CONDA_PLATFORM_SUBDIR} | grep -E ' python-[0-9]'
+
+
+[test:tweakwcs]
+repository = https://github.com/spacetelescope/tweakwcs
+script_setup =
+    pip install -e '.[test]'
+script =
+    pytest \
+        -r fEsx \
+        --basetemp="{{ func:basetemp_dir() }}" \
+        --junitxml="{{ func:junitxml_file() }}"
+
+
+[deploy:artifactory:delivery]
+files =
+    {{ storage.output_dir }}/**
+dest = {{ meta.mission }}/{{ info.build_name }}/
+
+
+[deploy:docker]
+registry = bytesalad.stsci.edu
+image_compression = zstd -v -9 -c
+build_args =
+    SNAPSHOT_INPUT={{ info.release_name }}.yml
+    SNAPSHOT_PKGDIR=packages
+tags =
+    {{ meta.name }}:{{ info.build_number }}-py{{ meta.python_compact }}
+    {{ deploy.docker.registry }}/{{ meta.name }}:{{ info.build_number }}-py{{ meta.python_compact }}
+test_script =
+    source /etc/profile
+    python -m pip freeze
+    mamba info
diff --git a/tests/data/gbo.yml b/tests/data/gbo.yml
new file mode 100644
index 0000000..3ab97a7
--- /dev/null
+++ b/tests/data/gbo.yml
@@ -0,0 +1,9 @@
+channels:
+  - conda-forge
+dependencies:
+  - pip
+  - python
+  - setuptools
+  - pip:
+    - firewatch==0.0.3
+    - tweakwcs==0.8.7
\ No newline at end of file
diff --git a/tests/data/generic_based_on.ini b/tests/data/generic_based_on.ini
deleted file mode 100644
index 1287933..0000000
--- a/tests/data/generic_based_on.ini
+++ /dev/null
@@ -1,65 +0,0 @@
-[meta]
-mission = generic
-name = GENERIC_BASED_ON
-version = 1.2.3
-rc = 1
-final = false
-based_on = {{ env:TEST_DATA }}/generic_based_on.yml
-python = 3.11
-
-
-[conda]
-installer_name = Miniforge3
-installer_version = 24.3.0-0
-installer_platform = {{env:STASIS_CONDA_PLATFORM}}
-installer_arch = {{env:STASIS_CONDA_ARCH}}
-installer_baseurl = https://github.com/conda-forge/miniforge/releases/download/{{conda.installer_version}}
-;conda_packages =
-pip_packages =
-    firewatch==0.0.4
-    tweakwcs==0.8.8
-
-
-[runtime]
-CPPFLAGS = ${CPPFLAGS} -fpermissive
-PYTHONUNBUFFERED = 1
-
-
-[test:firewatch]
-repository = https://github.com/astroconda/firewatch
-script_setup =
-    pip install -e '.'
-script =
-    firewatch -c conda-forge -p ${STASIS_CONDA_PLATFORM_SUBDIR} | grep -E ' python-[0-9]'
-
-
-[test:tweakwcs]
-repository = https://github.com/spacetelescope/tweakwcs
-script_setup =
-    pip install -e '.[test]'
-script =
-    pytest \
-        -r fEsx \
-        --basetemp="{{ func:basetemp_dir() }}" \
-        --junitxml="{{ func:junitxml_file() }}"
-
-
-[deploy:artifactory:delivery]
-files =
-    {{ storage.output_dir }}/**
-dest = {{ meta.mission }}/{{ info.build_name }}/
-
-
-[deploy:docker]
-registry = bytesalad.stsci.edu
-image_compression = zstd -v -9 -c
-build_args =
-    SNAPSHOT_INPUT={{ info.release_name }}.yml
-    SNAPSHOT_PKGDIR=packages
-tags =
-    {{ meta.name }}:{{ info.build_number }}-py{{ meta.python_compact }}
-    {{ deploy.docker.registry }}/{{ meta.name }}:{{ info.build_number }}-py{{ meta.python_compact }}
-test_script =
-    source /etc/profile
-    python -m pip freeze
-    mamba info
diff --git a/tests/data/generic_based_on.yml b/tests/data/generic_based_on.yml
deleted file mode 100644
index 3ab97a7..0000000
--- a/tests/data/generic_based_on.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-channels:
-  - conda-forge
-dependencies:
-  - pip
-  - python
-  - setuptools
-  - pip:
-    - firewatch==0.0.3
-    - tweakwcs==0.8.7
\ No newline at end of file
diff --git a/tests/rt_generic_based_on.sh b/tests/rt_generic_based_on.sh
index 7d78399..08498be 100644
--- a/tests/rt_generic_based_on.sh
+++ b/tests/rt_generic_based_on.sh
@@ -2,7 +2,7 @@
 here="$(dirname ${BASH_SOURCE[0]})"
 source $here/setup.sh
 
-TEST_NAME=generic_based_on
+TEST_NAME=gbo
 PYTHON_VERSIONS=(
     3.11
 )
diff --git a/tests/setup.sh b/tests/setup.sh
index 08e0de5..7e38cf9 100644
--- a/tests/setup.sh
+++ b/tests/setup.sh
@@ -32,7 +32,7 @@ popd() {
     command popd 1>/dev/null
 }
 
-WS_DEFAULT="workspaces/rt_workspace_"
+WS_DEFAULT="ws/_"
 setup_workspace() {
     if [ -z "$1" ]; then
         echo "setup_workspace requires a name argument" >&2
-- 
cgit