Fix gitops_02 to find KSU params under resource dir

Change-Id: I5154367d70784ffbeecc88fbc875c742ea82e753
Signed-off-by: garciadeblas <gerardo.garciadeblas@telefonica.com>

diff --git a/robot-systest/resources/gitops_02-jenkins-params.yaml b/robot-systest/resources/gitops_02-jenkins-params.yaml
new file mode 100644 (file)
index 0000000..b6b77a2
--- /dev/null
+++ b/robot-systest/resources/gitops_02-jenkins-params.yaml
@@ -0,0 +1,23 @@
+# 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.
+
+namespace: jenkins
+inline_values:
+  service:
+    ports:
+      http: "8080"
+      https: "8443"
+secret_values:
+  jenkinsUser: admin
+  jenkinsPassword: myJ3nk1n2P2ssw0rd
+

diff --git a/robot-systest/resources/jenkins-params.yaml b/robot-systest/resources/jenkins-params.yaml
deleted file mode 100644 (file)
index b6b77a2..0000000
--- a/robot-systest/resources/jenkins-params.yaml
+++ /dev/null
@@ -1,23 +0,0 @@
-# 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.
-
-namespace: jenkins
-inline_values:
-  service:
-    ports:
-      http: "8080"
-      https: "8443"
-secret_values:
-  jenkinsUser: admin
-  jenkinsPassword: myJ3nk1n2P2ssw0rd
-

diff --git a/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot b/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
index c3909de..11f5631 100644 (file)
--- a/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
+++ b/robot-systest/testsuite/gitops_02-declarative_cluster_registration_oka_ksu.robot
@@ -25,7 +25,7 @@ Resource   ../lib/vim_lib.resource
 
 Test Tags   gitops_02   cluster_gitops
 
-# Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
+Suite Teardown   Run Keyword And Ignore Error   Suite Cleanup
 
 
 *** Variables ***
@@ -50,7 +50,7 @@ ${CLUSTER_DESCRIPTION}   "Cluster for gitops02 Robot test suite"
 ${KSU_NS_NAME}   jenkins-ns
 ${KSU1_NAME}   testacme
 ${KSU2_NAME}   jenkins
-${KSU2_PARAMS}   ../resources/jenkins-params.yaml
+${KSU2_PARAMS}   ${CURDIR}/../resources/gitops_02-jenkins-params.yaml
 ${KSU_NS_ID}   ${EMPTY}
 ${KSU1_ID}   ${EMPTY}
 ${KSU2_ID}   ${EMPTY}