From: mei mei <meimei@huawei.com>
Date: Thu, 22 Mar 2018 02:21:26 +0000 (+0000)
Subject: Merge "Fetch creds according scenario type(os or k8)"
X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=b641622c5f67ac7c139f15efbbee4783c5dafba2;hp=e2873903c578d135a360aa7639de6654958c7ac4;p=releng.git

Merge "Fetch creds according scenario type(os or k8)"
---

diff --git a/jjb/yardstick/yardstick-daily-jobs.yml b/jjb/yardstick/yardstick-daily-jobs.yml
index 20890fa13..24c7f319b 100644
--- a/jjb/yardstick/yardstick-daily-jobs.yml
+++ b/jjb/yardstick/yardstick-daily-jobs.yml
@@ -262,8 +262,7 @@
       - description-setter:
           description: "POD: $NODE_NAME"
       - 'yardstick-cleanup'
-      - 'yardstick-fetch-os-creds'
-      - 'yardstick-fetch-k8s-conf'
+      - 'yardstick-fetch-creds'
       - 'yardstick-{testsuite}'
       - 'yardstick-store-results'
 
@@ -282,16 +281,23 @@
           !include-raw: ./yardstick-daily.sh
 
 - builder:
-    name: yardstick-fetch-os-creds
+    name: yardstick-fetch-creds
     builders:
-      - shell:
-          !include-raw: ../../utils/fetch_os_creds.sh
-
-- builder:
-    name: yardstick-fetch-k8s-conf
-    builders:
-      - shell:
-          !include-raw: ./yardstick-get-k8s-conf.sh
+      # yamllint disable rule:indentation
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "os-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw: ../../utils/fetch_os_creds.sh
+      - conditional-step:
+          condition-kind: regex-match
+          regex: "k8-.*"
+          label: '$DEPLOY_SCENARIO'
+          steps:
+            - shell:
+                !include-raw: ./yardstick-get-k8s-conf.sh
 
 - builder:
     name: yardstick-store-results
diff --git a/jjb/yardstick/yardstick-get-k8s-conf.sh b/jjb/yardstick/yardstick-get-k8s-conf.sh
index 22a6aa4e6..116d2f0d0 100755
--- a/jjb/yardstick/yardstick-get-k8s-conf.sh
+++ b/jjb/yardstick/yardstick-get-k8s-conf.sh
@@ -7,6 +7,7 @@ if [[ "${DEPLOY_SCENARIO:0:2}" == "k8" ]];then
     if [[ ${INSTALLER_TYPE} == 'joid' ]];then
         juju scp kubernetes-master/0:config "${dest_path}"
     elif [[ ${INSTALLER_TYPE} == 'compass' ]];then
+        echo "Copy admin.conf to ${dest_path}"
         docker cp compass-tasks:/opt/admin.conf "${dest_path}"
     fi
 fi