From 9562785a3c51db675238e3fdd4ff04d50f862ba8 Mon Sep 17 00:00:00 2001
From: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
Date: Fri, 8 Sep 2017 04:50:09 +0200
Subject: [PATCH] cleanup: Let SSH_KEY propagate, drop build script
Now that releng SSH_KEY and Fuel's SSH_KEY vars are aligned, let
Jenkins parameter propagate to <ci/deploy.sh>.
While touching CI scripts, drop obsolete <ci/build.sh>.
JIRA: ARMBAND-295
Change-Id: I616343c60abcd96370f7048bf7b23c6fefc9bcac
Signed-off-by: Alexandru Avadanii <Alexandru.Avadanii@enea.com>
---
ci/build.sh | 19 -------------------
ci/deploy.sh | 3 +--
2 files changed, 1 insertion(+), 21 deletions(-)
delete mode 100755 ci/build.sh
diff --git a/ci/build.sh b/ci/build.sh
deleted file mode 100755
index 6bbe5eeb..00000000
--- a/ci/build.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/bin/bash
-# Copyright (c) 2016 Enea Software AB
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Apache License, Version 2.0
-# which accompanies this distribution, and is available at
-# http://www.apache.org/licenses/LICENSE-2.0
-
-set -e
-
-SCRIPT_DIR=$(readlink -f $(dirname ${BASH_SOURCE[0]}))
-BUILD_BASE=$(readlink -f ${SCRIPT_DIR}/../upstream/fuel/build)
-
-export ARMBAND_BASE=$(readlink -e ${SCRIPT_DIR}/..)
-export OPNFV_GIT_SHA=$(git rev-parse HEAD)
-export LOCAL_CACHE_ARCH_NAME="armband-cache"
-
-# Initialize Armband git submodules & apply patches first
-make -C ${ARMBAND_BASE} patches-import
-cd ${ARMBAND_BASE}/upstream/fuel/ci && ./build.sh $*
diff --git a/ci/deploy.sh b/ci/deploy.sh
index b81e5c8c..a2f489ed 100755
--- a/ci/deploy.sh
+++ b/ci/deploy.sh
@@ -1,6 +1,6 @@
#!/bin/bash
#
-# (c) 2016 Enea Software AB
+# (c) 2017 Enea Software AB
#
# All rights reserved. This program and the accompanying materials
# are made available under the terms of the Apache License, Version 2.0
@@ -37,6 +37,5 @@ if ! [ -z $LAB_CONFIG_URL ]; then
fi
fi
-unset SSH_KEY
cd upstream/fuel/ci
./deploy.sh $@
--
2.16.6