Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
Flexpart
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Deploy
Releases
Package registry
Model registry
Operate
Terraform modules
Monitor
Service Desk
Analyze
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Benjamin Püschel
Flexpart
Commits
0336efae
Commit
0336efae
authored
11 months ago
by
Michael Blaschek
Browse files
Options
Downloads
Patches
Plain Diff
updated gitlab ci, testdata download
Former-commit-id:
a427ac99
parent
2c095d0f
No related branches found
No related tags found
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
.gitlab-ci.yml
+31
-2
31 additions, 2 deletions
.gitlab-ci.yml
Dockerfile_flexpart
+5
-1
5 additions, 1 deletion
Dockerfile_flexpart
tests/pathnames
+1
-1
1 addition, 1 deletion
tests/pathnames
with
37 additions
and
4 deletions
.gitlab-ci.yml
+
31
−
2
View file @
0336efae
...
...
@@ -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"
\ No newline at end of file
-
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"
# base:
# stage: container
# image:
\ No newline at end of file
This diff is collapsed.
Click to expand it.
Dockerfile_flexpart
+
5
−
1
View file @
0336efae
...
...
@@ -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
#
...
...
This diff is collapsed.
Click to expand it.
tests/pathnames
+
1
−
1
View file @
0336efae
./current/
./output/
./
default_winds
/
./
testdata
/
./default_winds/AVAILABLE
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment