updated gitlab ci, testdata download

Former-commit-id: a427ac99

.gitlab-ci.yml

@@ -2,11 +2,13 @@ stages:
   - build
   - test
   - compare
+  # - container
 
 default:
   tags:
     - podman
 
+
 alma8-build:
   image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
   stage: build
@@ -22,7 +24,7 @@ alma8-build:
     paths:
       - ./src/FLEXPART
       - ./src/FLEXPART_ETA
-    expire_in: never
+    expire_in: 1d
 
 rocky9-build:
   image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
@@ -39,7 +41,27 @@ rocky9-build:
     paths:
       - ./src/FLEXPART
       - ./src/FLEXPART_ETA
+    expire_in: 1d
+
+.download:
+  cache:
+    paths:
+      - ./tests/testdata
+    policy: pull
+
+setup:
+  stage: test
+  image: harbor.wolke.img.univie.ac.at/flexpart/rockylinux9:latest
+  script:
+    - mkdir ./tests/testdata
+    - wget -P ./tests/testdata "https://webdata.wolke.img.univie.ac.at/flexpart/*"
+  extends: .download
+  cache:
+    policy: pull-push
+  artifacts:
     expire_in: never
+    paths:
+      - ./tests/testdata
 
 options-test:
   # image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
@@ -49,6 +71,7 @@ options-test:
     - alma8-build
     - rocky9-build
 
+  extends: .download
   script:
     - ulimit -s unlimited
     - bash ./tests/run_default_options_test.sh
@@ -76,6 +99,8 @@ nests-test:
   artifacts:
     when: on_success
     paths:
+      - ./tests/output_nests
+    expire_in: 5 mins
 
 openmp-simulation:
   # image: harbor.wolke.img.univie.ac.at/flexpart/almalinux8:latest
@@ -179,4 +204,8 @@ documentation:
     - if: '$CI_COMMIT_REF_NAME == "master"'
   script:
     - cd ./documentation && mkdocs build -c --verbose
-    - sshpass -p "$WOLKE_PASSWORD" rsync -autv --delete -e "ssh -o StrictHostKeyChecking=no" /tmp/cr-site/* "$WOLKE_USER@wolke.img.univie.ac.at:/var/www/flexpart/docs"
+    - sshpass -p "$WOLKE_PASSWORD" rsync -autv --delete -e "ssh -o StrictHostKeyChecking=no" /tmp/cr-site/* "$WOLKE_USER@wolke.img.univie.ac.at:/var/www/flexpart/docs"
\ No newline at end of file
+
+# base:
+#   stage: container
+#   image: 
\ No newline at end of file

Dockerfile_flexpart

@@ -15,7 +15,11 @@ ARG COMMIT=0
 ENV COMMIT=$COMMIT
 COPY ./src /src
 COPY ./tests/default_options /options
-COPY ./tests/default_winds /inputs
+
+# since the new data set is larger, we download the data for the container
+RUN wget -P /inputs "https://webdata.wolke.img.univie.ac.at/flexpart/*"
+# COPY ./tests/default_winds /inputs
+
 COPY ./entrypoint.sh /entrypoint.sh
 WORKDIR /src
 #

tests/pathnames

 ./current/
 ./output/
-./default_winds/
+./testdata/
 ./default_winds/AVAILABLE