From 736e04d31c0c350fb324b8c238d0e49bfce3b445 Mon Sep 17 00:00:00 2001
From: Jean-Baptiste Keck <Jean-Baptiste.Keck@imag.fr>
Date: Fri, 6 Oct 2017 13:38:01 +0200
Subject: [PATCH] install test
---
.gitlab-ci.yml | 13 +++++++++++--
ci/scripts/build_install_clean.sh | 13 -------------
ci/scripts/run_tests.sh | 12 ------------
3 files changed, 11 insertions(+), 27 deletions(-)
delete mode 100644 ci/scripts/build_install_clean.sh
delete mode 100644 ci/scripts/run_tests.sh
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 33415b002..247cd975f 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ stages:
- env
- configure
- build
+ - install
- test
env:ubuntu_zesty:
@@ -34,6 +35,14 @@ build:ubuntu_zesty:
paths:
- ./build
+install:ubuntu_zesty:
+ image: keckj/hysop:ubuntu_zesty
+ stage: install
+ script:
+ - "sh ci/scripts/install.sh ./build/gcc-6"
+ dependencies:
+ - build:ubuntu_zesty
+
test:ubuntu_zesty:
image: keckj/hysop:ubuntu_zesty
stage: test
@@ -42,9 +51,9 @@ test:ubuntu_zesty:
- mkdir -p "/home/hysoprunner"
- chown hysoprunner:hysoprunner "/home/hysoprunner"
- chmod u+rw "/home/hysoprunner"
- - su hysoprunner -c "sh ci/scripts/run_tests.sh"
+ - su hysoprunner -c "sh ci/scripts/test.sh ./build/gcc-6"
dependencies:
- - build:ubuntu_zesty
+ - install:ubuntu_zesty
cache:
paths:
- /home/hysoprunner
diff --git a/ci/scripts/build_install_clean.sh b/ci/scripts/build_install_clean.sh
deleted file mode 100644
index 7d6b661e8..000000000
--- a/ci/scripts/build_install_clean.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-set -e
-cd build
-make
-make install
-cd -
-python -c 'import hysop'
-cd build
-echo 'y\n' | make uninstall
-make clean
-cd -
-rm -rf build
-exit 0
diff --git a/ci/scripts/run_tests.sh b/ci/scripts/run_tests.sh
deleted file mode 100644
index 6cc1d9231..000000000
--- a/ci/scripts/run_tests.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-set -e
-mkdir build
-cd build
-export FC=mpif90 CC=mpicc CXX=mpic++
-cmake -DCMAKE_BUILD_TYPE=Release ..
-make
-make install
-#make test
-HYSOP='../../hysop'
-python "$HYSOP/operator/test_transpose.py"
-exit 0
--
GitLab