add first class rsh, better deal with args for proxy cmds like exec, rsh

openshift · Nov 16, 2017 · ab4b7bf · ab4b7bf
1 parent 06ed726
commit ab4b7bf
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 8 deletions.
diff --git a/examples/jenkins-image-sample.groovy b/examples/jenkins-image-sample.groovy
@@ -72,6 +72,10 @@ try {
                 echo "Database will run in deployment config: ${dcs.name()}"
                 // Find a least one pod related to the DeploymentConfig and wait it satisfies a condition
                 dcs.related('pods').untilEach(1) {
+                    // some example debug of the pod in question
+                    // commented out until v1.0.3 of the plugin is in the openshift jenkins image 
+                    //shortname = it.object().metadata.name
+                    //echo openshift.rsh("${shortname}", "hostname").out
                     // untilEach only terminates when each selected item causes the body to return true
                     return it.object().status.phase != 'Pending'
                 }

diff --git a/src/main/java/com/openshift/jenkins/plugins/util/ClientCommandBuilder.java b/src/main/java/com/openshift/jenkins/plugins/util/ClientCommandBuilder.java
@@ -71,14 +71,9 @@ public List<String> buildCommand(boolean redacted) {
 
         String toolName = (new OpenShift.DescriptorImpl()).getClientToolName();
         cmd.add(toolName);
-        cmd.add(verb);
-
-        cmd.addAll(toStringArray(verbArgs));
-
-        cmd.addAll(toStringArray(userArgs));
-
-        cmd.addAll(toStringArray(options));
-
+
+        // in general with 'oc' if the '--' args preceded the verb that helps
+        // with some of the exec/rsh type scenarios 
         if (this.server != null) {
             cmd.add("--server=" + server);
         }
@@ -111,6 +106,14 @@ public List<String> buildCommand(boolean redacted) {
                 cmd.add("--token=" + token);
             }
         }
+
+        cmd.add(verb);
+
+        cmd.addAll(toStringArray(verbArgs));
+
+        cmd.addAll(toStringArray(userArgs));
+
+        cmd.addAll(toStringArray(options));
 
         return cmd;
     }

diff --git a/src/main/resources/com/openshift/jenkins/plugins/OpenShiftDSL.groovy b/src/main/resources/com/openshift/jenkins/plugins/OpenShiftDSL.groovy
@@ -735,6 +735,7 @@ class OpenShiftDSL implements Serializable {
     }
 
     public Result exec(Object... args) { return simplePassthrough("exec", args); }
+    public Result rsh(Object... args) { return simplePassthrough("rsh", args); }
     public Result idle(Object... args) { return simplePassthrough("idle", args); }
     public Result _import(Object... args) { return simplePassthrough("import", args); }
     public Result policy(Object... args) { return simplePassthrough("policy", args); }