From 3437f42fe66740827ff909963d99ba197b9646ae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Nicolas=20Mass=C3=A9?= <nicolas.masse@itix.fr>
Date: Wed, 22 May 2019 09:36:22 +0200
Subject: [PATCH] WiP

---
 README.md               |  2 +-
 testcase-01/Jenkinsfile | 13 +++++++++----
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/README.md b/README.md
index b642220..16f21cc 100644
--- a/README.md
+++ b/README.md
@@ -5,7 +5,7 @@
 ```sh
 oc project api-lifecycle
 3scale remote add $NAME https://$TOKEN@$TENANT.3scale.net/
-oc create secret generic 3scale-toolbox --from-file=~/.3scalerc.yaml
+oc create secret generic 3scale-toolbox --from-file=$HOME/.3scalerc.yaml
 ```
 
 ```sh
diff --git a/testcase-01/Jenkinsfile b/testcase-01/Jenkinsfile
index 236a0c2..6ba9698 100644
--- a/testcase-01/Jenkinsfile
+++ b/testcase-01/Jenkinsfile
@@ -1,6 +1,9 @@
 #!groovy
 
-def toolbox = load '../3scale_toolbox.groovy'
+library identifier: '3scale-toolbox-jenkins@master', 
+        retriever: modernSCM([$class: 'GitSCMSource',
+                              remote: 'https://github.com/nmasse-itix/3scale-toolbox-jenkins.git'])
+
 def toolboxConfig = [
   "secretName": params.SECRET_NAME
 ]
@@ -8,13 +11,14 @@ def baseSystemName = toolbox.generateRandomBaseSystemName()
 
 node() {
   stage('Checkout Source') {
+    //git url: "https://github.com/nmasse-itix/API-Lifecycle-Mockup.git"
     checkout scm
   }
 
   stage("Get toolbox version") {
     openshift.withCluster() {
       openshift.withProject(params.NAMESPACE) {
-        echo "toolbox version = " + toolbox.getToolboxVersion()
+        echo "toolbox version = " + toolbox.getToolboxVersion(openshift: openshift)
       }
     }
   }
@@ -22,9 +26,10 @@ node() {
   stage("Import OpenAPI") {
     openshift.withCluster() {
       openshift.withProject(params.NAMESPACE) {
-        toolbox.importOpenAPI(destination: params.TARGET_INSTANCE,
+        toolbox.importOpenAPI(openshift: openshift,
+                              destination: params.TARGET_INSTANCE,
                               toolboxConfig: toolboxConfig,
-                              oasFile: "swagger.json",
+                              oasFile: "testcase-01/swagger.json",
                               baseSystemName: baseSystemName) 
       }
     }