From 95bf07fc9a54983a0318b27797f51e2a18e957a5 Mon Sep 17 00:00:00 2001
From: Axel von Arnim <axel.vonarnim@fortiss.org>
Date: Thu, 27 Sep 2018 08:44:17 +0000
Subject: [PATCH] Merged in NRRPLT-6586_MakefileNoVpn (pull request #2)
[NRRPLT-6586] Makefile uses no VPN anymore
Approved-by: Manos Angelidis <angelidis@fortiss.org>
---
Makefile | 10 ++++++----
bitbucket-pipelines.yml | 1 -
2 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/Makefile b/Makefile
index ebc9d9d..b379286 100644
--- a/Makefile
+++ b/Makefile
@@ -16,17 +16,19 @@ PYTHON_PIP_VERSION?=pip==9.0.3
##### DO NOT MODIFY BELOW #####################
ifeq ($(NRP_INSTALL_MODE),user)
+ $(shell cp -af $(HBP)/user-scripts/config_files/platform_venv/* $(VIRTUAL_ENV)/lib/python2.7/site-packages/ )
include user_makefile
else
- CI_REPO?=ssh://bbpcode.epfl.ch/platform/ContinuousIntegration.git
- CI_DIR?=ContinuousIntegration
+ $(shell cp -af $(HBP)/user-scripts/config_files/platform_venv/* $(VIRTUAL_ENV)/lib/python2.7/site-packages/ )
+ CI_REPO?=git@bitbucket.org:hbpneurorobotics/admin-scripts.git
+ CI_DIR?=$(HBP)/admin-scripts/ContinuousIntegration
+ THIS_DIR:=$(PWD)
FETCH_CI := $(shell \
if [ ! -d $(CI_DIR) ]; then \
- git clone $(CI_REPO) $(CI_DIR) > /dev/null ;\
+ cd $(HBP) && git clone $(CI_REPO) > /dev/null && cd $(THIS_DIR);\
fi;\
echo $(CI_DIR) )
include $(FETCH_CI)/python/common_makefile
endif
-
diff --git a/bitbucket-pipelines.yml b/bitbucket-pipelines.yml
index 33a8df5..7bbdb7e 100644
--- a/bitbucket-pipelines.yml
+++ b/bitbucket-pipelines.yml
@@ -16,7 +16,6 @@ pipelines:
- cd $BITBUCKET_CLONE_DIR
# Configure build
- - ln -s $HBP/admin-scripts/ContinuousIntegration
- export VIRTUAL_ENV_PATH=$VIRTUAL_ENV
- export NRP_INSTALL_MODE=dev
- export PYTHONPATH=hbp_nrp_virtual_coach:$VIRTUAL_ENV_PATH/lib/python2.7/site-packages:$PYTHONPATH
--
GitLab