Skip to content

Commit eceaf61

Browse files
authored
fix end2end testing (#444)
* Add step to show installed Python packages * fix back to typo needs to be addressed in its own issue * fixes after review
1 parent e75909c commit eceaf61

4 files changed

Lines changed: 6 additions & 4 deletions

File tree

.github/workflows/end2end_run.yml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ jobs:
4242
python -m pip install --upgrade pip
4343
python -m pip install -e .[dev]
4444
if [ -f requirements.txt ]; then pip install -r requirements.txt; fi
45+
- name: show environment
46+
run: python -m pip freeze
4547
- name: end2end test with pytest
4648
run: |
4749
pytest -p no:warnings --doctest-rst -m "end2end" --pyargs stixcore --remote-data=any

docs/pipelineconfiguration.rst

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ SOLMOC TM data is synced from pub026 via rsync by cron every 15min.
4444
.. code-block::
4545
4646
# sync TM data from GFTS to local "wait for processing" folder
47-
*/15 * * * * rsync -av stixcore@147.86.8.26:'/home/solmoc/from_edds/tm/*PktTmRaw*.xml' /data/stix/SOLSOC/from_edds/tm/incoming > /dev/null
47+
*/15 * * * * rsync -av stixcore@147.86.8.26:'/home/solmoc/from_edds/tm/*PktTmRaw*.xml' /data/stix/SOLSOC/from_edds/tm/incomming > /dev/null
4848
4949
The very latest SPICE kernels are required for accurate pointing information of the satellite.
5050
We may receive TM files via GFTS that contain data for times that are not available in the latest SPICE kernels, as the latest SPICE kernels have not yet been updated and delivered.
@@ -53,7 +53,7 @@ Therefore, a stage and delay step is added via cron (every 30 min) that only pub
5353
.. code-block::
5454
5555
# move the TM data from the wait into the processing folder - that will trigger the pipeline to "get started": the wait period is meanwhile short
56-
*/30 * * * * find /data/stix/SOLSOC/from_edds/tm/incoming/ -type f -mmin +2 -exec rsync -a {} /data/stix/SOLSOC/from_edds/tm/processing/ \;
56+
*/30 * * * * find /data/stix/SOLSOC/from_edds/tm/incomming/ -type f -mmin +2 -exec rsync -a {} /data/stix/SOLSOC/from_edds/tm/processing/ \;
5757
5858
Sync STIX-CONF repo in all used instances
5959
*****************************************

stixcore/util/scripts/end2end_testing.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ def end2end_pipeline(indir, fitsdir):
188188
splits=1,
189189
outdir=datapath,
190190
socdir=Path(
191-
"/data/stix/SOLSOC/from_edds/tm/incoming/",
191+
"/data/stix/SOLSOC/from_edds/tm/incomming/",
192192
),
193193
)
194194

stixcore/util/scripts/find_unprocessed_tm.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212
TM_REGEX = re.compile(r".*PktTmRaw.*.xml$")
1313
logging_dir = Path(CONFIG.get("Pipeline", "log_dir"))
1414
tm_dir = Path(CONFIG.get("Paths", "tm_archive"))
15-
tm_dir = Path("/data/stix/SOLSOC/from_edds/tm/incoming")
15+
tm_dir = Path("/data/stix/SOLSOC/from_edds/tm/incomming")
1616
list_of_log_files = logging_dir.glob("*.xml.out")
1717
latest_log_file = (
1818
logging_dir / "TM_BatchRequest.PktTmRaw.SOL.0.2023.305.15.33.13.852.bBWz@2023.352.21.00.01.039.1.xml.out"

0 commit comments

Comments
 (0)