From a48d9d369a9a3fe8dd12f129d2f1d459a627f466 Mon Sep 17 00:00:00 2001
From: Jan Caron <j.caron@fz-juelich.de>
Date: Tue, 18 Dec 2018 08:57:21 +0100
Subject: [PATCH] Configured gitlab-ci.yml to use the new jugit GitLab server
---
.gitlab-ci.yml | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0d48f2c..fe58852 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -6,13 +6,12 @@ before_script:
- mkdir -p --mode=700 ~/.ssh/
# Add SSH key for jutil:
- echo "$ID_RSA_JUTIL_PRIVATE" > ~/.ssh/id_rsa_jutil
+ # Configure SSH to use ~/.ssh/id_rsa_jutil for jugit.fz-juelich.de (-e allows \n):
+ - echo -e "Host jugit.fz-juelich.de\n\tIdentityFile ~/.ssh/id_rsa_jutil\n" > ~/.ssh/config
+ # Add jugit.fz-juelich.de to known_hosts (not the same key as Jutil!):
+ - echo jugit.fz-juelich.de, 134.94.130.31 "$ID_RSA_JUTIL_PUBLIC" > ~/.ssh/known_hosts
# Provide read access to owner (octal value code: 400) to jutil key and known_hosts with chmod:
- chmod 400 ~/.ssh/id_rsa_jutil
- # Configure SSH to use ~/.ssh/jutil_key for iffgit.fz-juelich.de (-e allows \n):
- - echo -e "Host iffgit.fz-juelich.de\n\tIdentityFile ~/.ssh/id_rsa_jutil\n" > ~/.ssh/config
- # Add iffgit.fz-juelich.de to known_hosts (not the same key as Jutil!):
- - echo iffgit.fz-juelich.de,134.94.161.83 "$ID_RSA_JUTIL_PUBLIC" > ~/.ssh/known_hosts
- # Provide read access to owner (octal value code: 400) to known_hosts with chmod:
- chmod 400 ~/.ssh/known_hosts
# Install necessary apps like git and mesa-utils (needed for GL):
# TODO: Check if this is still needed after removing mayavi!?
@@ -32,7 +31,7 @@ test_miniconda:
- conda uninstall mayavi vtk -y # TODO: necessary, because mayavi does not play nice with qt5!
- conda install pyqt=5 # TODO: This is needed for tests to run, but breaks mayavi (not used)!
# Install jutil via secure ssh connection:
- - pip install git+ssh://gitlab@iffgit.fz-juelich.de/unger/jutil.git
+ - pip install git+ssh://gitlab@jugit.fz-juelich.de/unger/jutil.git
# Execute tests:
- python setup.py test
# Create coverage report:
--
GitLab