From dd414f5d285a287f1f93b92ef4ea77e5903d2fca Mon Sep 17 00:00:00 2001 From: anli Date: Mon, 11 Mar 2019 13:01:58 +0800 Subject: [PATCH 1/2] add directory for cvp cases --- cvpcases/README.md | 24 ++++++++++++++++++++++++ cvpcases/oc-fail | 2 ++ cvpcases/oc-pass | 2 ++ 3 files changed, 28 insertions(+) create mode 100644 cvpcases/README.md create mode 100644 cvpcases/oc-fail create mode 100644 cvpcases/oc-pass diff --git a/cvpcases/README.md b/cvpcases/README.md new file mode 100644 index 00000000..718b8596 --- /dev/null +++ b/cvpcases/README.md @@ -0,0 +1,24 @@ +This folder include all cvp cases and the other configuration to access a cluster will be generated by the jenkins job. +
+#The case scripts +
+1) the script must be a shell with same name with the case name +
+2) the case must be executed able. +
+3) the case must return pass( 0) or fail (not 0) + +#The following files will be placed under this directory by jenkins job. +
+1) The Build Artifacts from Launch Environment Flexy job +
+ For example: https://openshift-qe-jenkins.rhev-ci-vms.eng.rdu2.redhat.com/job/Launch%20Environment%20Flexy/57679/ +
+2) File description +
+ host.spec: the host configure file for cucushift +
+ hosts: the ansible inventory file +
+ kubeconfig: the cluster-admin kubeconfig + diff --git a/cvpcases/oc-fail b/cvpcases/oc-fail new file mode 100644 index 00000000..4f5c5d51 --- /dev/null +++ b/cvpcases/oc-fail @@ -0,0 +1,2 @@ +#/bin/bash +exit 1 diff --git a/cvpcases/oc-pass b/cvpcases/oc-pass new file mode 100644 index 00000000..815956dd --- /dev/null +++ b/cvpcases/oc-pass @@ -0,0 +1,2 @@ +#/bin/bash +exit 0 From a4f8a0fd65ddf5b0aea15cf95d85965b038bf6ce Mon Sep 17 00:00:00 2001 From: anli Date: Mon, 11 Mar 2019 13:12:36 +0800 Subject: [PATCH 2/2] add more instruction --- cvpcases/README.md | 10 ++++++---- cvpcases/oc-fail | 2 ++ cvpcases/oc-pass | 2 ++ 3 files changed, 10 insertions(+), 4 deletions(-) diff --git a/cvpcases/README.md b/cvpcases/README.md index 718b8596..6dbf0419 100644 --- a/cvpcases/README.md +++ b/cvpcases/README.md @@ -2,11 +2,13 @@ This folder include all cvp cases and the other configuration to access a cluste
#The case scripts
-1) the script must be a shell with same name with the case name +1) The script must be a shell using same name as the case name
-2) the case must be executed able. +2) The script should return pass( 0) or fail (not 0)
-3) the case must return pass( 0) or fail (not 0) +3) It is better to use relative path in your scripts +
+4) The script will be executed in this director {$PWD=this directory} #The following files will be placed under this directory by jenkins job.
@@ -21,4 +23,4 @@ This folder include all cvp cases and the other configuration to access a cluste hosts: the ansible inventory file
kubeconfig: the cluster-admin kubeconfig - +# The oc binary is places under the default PATH directory $HOME/bin diff --git a/cvpcases/oc-fail b/cvpcases/oc-fail index 4f5c5d51..df97e0ba 100644 --- a/cvpcases/oc-fail +++ b/cvpcases/oc-fail @@ -1,2 +1,4 @@ #/bin/bash +oc version --kubeconfig=kubeconfig +oc get clusters --kubeconfig=kubeconfig exit 1 diff --git a/cvpcases/oc-pass b/cvpcases/oc-pass index 815956dd..2dc310e6 100644 --- a/cvpcases/oc-pass +++ b/cvpcases/oc-pass @@ -1,2 +1,4 @@ #/bin/bash +oc version --kubeconfig=kubeconfig +oc get clusters --kubeconfig=kubeconfig exit 0