From 3c25fabc0802a4f2aa17c7e5b28de2376833d429 Mon Sep 17 00:00:00 2001
From: garciadeblas <gerardo.garciadeblas@telefonica.com>
Date: Mon, 18 Nov 2019 17:24:43 +0100
Subject: [PATCH] Moved common from jenkins folder to devops root folder

Change-Id: Ib56b840f5d91f5962daa5fd06d80eb1888617f9e
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>
---
 {jenkins/common => common}/all_funcs      |  6 +++---
 {jenkins/common => common}/config         |  0
 {jenkins/common => common}/container      |  0
 {jenkins/common => common}/git_functions  | 13 +++++++++++++
 {jenkins/common => common}/install_common |  0
 {jenkins/common => common}/logging        |  0
 installers/full_install_osm.sh            |  3 +--
 installers/nat_osm                        |  3 +--
 8 files changed, 18 insertions(+), 7 deletions(-)
 rename {jenkins/common => common}/all_funcs (86%)
 rename {jenkins/common => common}/config (100%)
 rename {jenkins/common => common}/container (100%)
 rename {jenkins/common => common}/git_functions (66%)
 rename {jenkins/common => common}/install_common (100%)
 rename {jenkins/common => common}/logging (100%)

diff --git a/jenkins/common/all_funcs b/common/all_funcs
similarity index 86%
rename from jenkins/common/all_funcs
rename to common/all_funcs
index a8471087..d4693733 100644
--- a/jenkins/common/all_funcs
+++ b/common/all_funcs
@@ -18,11 +18,11 @@
 #
 # 24 June 2016 -- Jeremy Mordkoff -- Genesis
 
-if [ -z "$OSM_JENKINS" ]; then
-	export OSM_JENKINS=$(realpath $(dirname ${BASH_SOURCE[0]} ))
+if [ -z "$OSM_DEVOPS" ]; then
+	export OSM_DEVOPS=$(realpath ${BASH_SOURCE[0]} )
 fi
 
 for file in logging config container git_functions; do
-	. ${OSM_JENKINS}/common/$file
+	. ${OSM_DEVOPS}/common/$file
 	INFO "$file sourced"
 done
diff --git a/jenkins/common/config b/common/config
similarity index 100%
rename from jenkins/common/config
rename to common/config
diff --git a/jenkins/common/container b/common/container
similarity index 100%
rename from jenkins/common/container
rename to common/container
diff --git a/jenkins/common/git_functions b/common/git_functions
similarity index 66%
rename from jenkins/common/git_functions
rename to common/git_functions
index e5b79845..7cfee883 100644
--- a/jenkins/common/git_functions
+++ b/common/git_functions
@@ -1,4 +1,17 @@
 #!/bin/bash
+#
+#   Licensed under the Apache License, Version 2.0 (the "License");
+#   you may not use this file except in compliance with the License.
+#   You may obtain a copy of the License at
+#
+#       http://www.apache.org/licenses/LICENSE-2.0
+#
+#   Unless required by applicable law or agreed to in writing, software
+#   distributed under the License is distributed on an "AS IS" BASIS,
+#   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#   See the License for the specific language governing permissions and
+#   limitations under the License.
+#
 
 
 GIT() {
diff --git a/jenkins/common/install_common b/common/install_common
similarity index 100%
rename from jenkins/common/install_common
rename to common/install_common
diff --git a/jenkins/common/logging b/common/logging
similarity index 100%
rename from jenkins/common/logging
rename to common/logging
diff --git a/installers/full_install_osm.sh b/installers/full_install_osm.sh
index 7b45761a..776ab061 100755
--- a/installers/full_install_osm.sh
+++ b/installers/full_install_osm.sh
@@ -1415,8 +1415,7 @@ if [ -z "$OSM_DEVOPS" ]; then
     fi
 fi
 
-OSM_JENKINS="$OSM_DEVOPS/jenkins"
-. $OSM_JENKINS/common/all_funcs
+. $OSM_DEVOPS/common/all_funcs
 
 [ -n "$INSTALL_LIGHTWEIGHT" ] && [ -n "$UNINSTALL" ] && uninstall_lightweight && echo -e "\nDONE" && exit 0
 [ -n "$UNINSTALL" ] && uninstall && echo -e "\nDONE" && exit 0
diff --git a/installers/nat_osm b/installers/nat_osm
index b7b70970..e12a123f 100755
--- a/installers/nat_osm
+++ b/installers/nat_osm
@@ -36,8 +36,7 @@ usage(){
 
 HERE=$(realpath $(dirname $0))
 OSM_DEVOPS=$(dirname $HERE)
-OSM_JENKINS="$OSM_DEVOPS/jenkins"
-. $OSM_JENKINS/common/all_funcs
+. $OSM_DEVOPS/common/all_funcs
 
 #Get default IP address
 . $OSM_DEVOPS/installers/export_ips
-- 
2.25.1