Merge "Stable Branch for Hunter Release"

diff --git a/jjb/functest/functest-k8.sh b/jjb/functest/functest-k8.sh
index 8561b02..a4d80e1 100755 (executable)
--- a/jjb/functest/functest-k8.sh
+++ b/jjb/functest/functest-k8.sh
@@ -24,7 +24,7 @@ elif [[ ${INSTALLER_TYPE} == 'fuel' ]]; then
     admin_conf_file_vol="-v ${HOME}/admin.conf:/root/.kube/config"
     KUBE_MASTER_URL=$(awk '/server:/ {print $2}' ${HOME}/admin.conf | grep -Fv localhost)
     KUBE_MASTER_IP=$(echo $KUBE_MASTER_URL | grep -Po '(\d+\.){3}\d+')
-    for k in KUBERNETES_PROVIDER KUBE_MASTER_URL KUBE_MASTER_IP; do
+    for k in KUBE_MASTER_URL KUBE_MASTER_IP; do
         echo "export $k=${!k}" >> $rc_file
     done
 else

diff --git a/releases/hunter/clover.yaml b/releases/hunter/clover.yaml
new file mode 100644 (file)
index 0000000..1bc9288
--- /dev/null
+++ b/releases/hunter/clover.yaml
@@ -0,0 +1,9 @@
+---
+project: clover
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      clover: 3f86a3d611f4d2a4f21d9be2a2284ccf120db36e

diff --git a/releases/hunter/doctor.yaml b/releases/hunter/doctor.yaml
new file mode 100644 (file)
index 0000000..ff16aec
--- /dev/null
+++ b/releases/hunter/doctor.yaml
@@ -0,0 +1,17 @@
+# SPDX-License-Identifier: Apache-2.0
+##############################################################################
+# Copyright (c) 2019 Nokia Corporation and others.
+# 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
+##############################################################################
+---
+project: doctor
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      doctor: 73605c5c34b97ab56306bfa9af0f5888f3c7e46d

diff --git a/releases/hunter/fds.yaml b/releases/hunter/fds.yaml
new file mode 100644 (file)
index 0000000..8c33218
--- /dev/null
+++ b/releases/hunter/fds.yaml
@@ -0,0 +1,9 @@
+---
+project: fds
+project-type: feature
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      fds: 20cef81fd594f10949e151fd5a0a439af0a844e4

diff --git a/releases/hunter/vswitchperf.yaml b/releases/hunter/vswitchperf.yaml
new file mode 100644 (file)
index 0000000..f0335f4
--- /dev/null
+++ b/releases/hunter/vswitchperf.yaml
@@ -0,0 +1,9 @@
+---
+project: vswitchperf
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      vswitchperf: 589639d313c24104b2a27ef16baf716d1d274108

diff --git a/releases/hunter/yardstick.yaml b/releases/hunter/yardstick.yaml
new file mode 100644 (file)
index 0000000..88391b0
--- /dev/null
+++ b/releases/hunter/yardstick.yaml
@@ -0,0 +1,9 @@
+---
+project: yardstick
+project-type: testing
+release-model: stable
+
+branches:
+  - name: stable/hunter
+    location:
+      yardstick: 85899baa90714ae15add21a330316793071168ae

diff --git a/utils/fetch_k8_conf.sh b/utils/fetch_k8_conf.sh
index b3be0d6..e5e237d 100755 (executable)
--- a/utils/fetch_k8_conf.sh
+++ b/utils/fetch_k8_conf.sh
@@ -61,7 +61,7 @@ elif [ "$installer_type" == "joid" ]; then
     info "Do nothing, config file has been provided in $HOME/joid_config/config for joid"
 elif [ "$installer_type" == "fuel" ]; then
     info "Getting kubernetes config ..."
-    docker cp fuel:/opt/kubernetes.config $dest_path
+    docker cp -L fuel:/opt/kubernetes.config $dest_path
 else
     error "Installer $installer_type is not supported by this script"
 fi