From e46fc01837d69e25c0479f7b30df719d00f2af0b Mon Sep 17 00:00:00 2001
From: Sebastiaan van der Tol <tol@astron.nl>
Date: Wed, 19 Aug 2020 10:24:50 +0200
Subject: [PATCH] Use fork of OSKAR in CI/CD
---
.gitlab-ci.yml | 9 +++++----
1 file changed, 5 insertions(+), 4 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e451d797..28fa6ee3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -78,9 +78,10 @@ build-compare-oskar:
before_script:
- apt-get -y install python3-pip
# Install python requirements for the OSKAR "integration" test
- - pip3 install numpy==1.19.0 scipy h5py astropy tqdm matplotlib
+ - pip3 install numpy==1.19.0 scipy h5py astropy tqdm matplotlib pandas lofarantpos
- mkdir -p /opt/oskar/build
- - cd /opt/oskar && git clone https://github.com/OxfordSKA/OSKAR.git
+ - cd /opt/oskar && git clone https://github.com/basvandertol/OSKAR.git
+ - cd OSKAR && git checkout fix-transformations
- cd /opt/oskar/build
script:
# OSKAR cpp install
@@ -96,8 +97,8 @@ build-compare-oskar:
- cd /opt/everybeam/build
- make VERBOSE=1 comparison-oskar-basefunctions
# Run OSKAR stationresponse comparison
- - export NPIXELS=32 && TOLERANCE=1e-5
- - make VERBOSE=1 comparison-oskar-stationresponse
+ - export NPIXELS=32 TOLERANCE=1e-5
+ - make VERBOSE=1 comparison-oskar-station-response
deploy-doc:
stage: deploy
--
GitLab