JENKINS-12741 Removed call to addTunnelToMap - this is now included i…

…n the openConnection() method
jenkinsci · Feb 17, 2012 · 57df006 · 57df006
1 parent e042d6c
commit 57df006
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -115,7 +115,7 @@
         <dependency>
             <groupId>com.saucelabs</groupId>
             <artifactId>ci-sauce</artifactId>
-            <version>1.6</version>
+            <version>1.7</version>
             <scope>compile</scope>
         </dependency>
         <dependency>

diff --git a/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper.java b/src/main/java/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper.java
@@ -267,12 +267,11 @@ public SauceConnectStarter(String buildName, BuildListener listener, int port, F
 
         public ITunnelHolder call() throws IOException {
             TunnelHolder tunnelHolder = new TunnelHolder(username);
-            //SauceTunnelManager sauceManager = new SauceConnectTwoManager();
             SauceTunnelManager sauceManager = null;
             try {
                 sauceManager = HudsonSauceManagerFactory.getInstance().createSauceConnectManager();
                 Object process = sauceManager.openConnection(username, key, port, sauceConnectJar, listener.getLogger());
-                sauceManager.addTunnelToMap(buildName, process);
+
                 tunnelHolder.tunnelManagers.add(sauceManager);
                 return tunnelHolder;
             } catch (ComponentLookupException e) {

diff --git a/src/main/resources/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper/config.jelly b/src/main/resources/hudson/plugins/sauce_ondemand/SauceOnDemandBuildWrapper/config.jelly
@@ -2,6 +2,7 @@
          xmlns:t="/lib/hudson" xmlns:f="/lib/form">
 
     <f:block>
+        <f:section title="Sauce Connect Options">
         <f:entry field="enableSauceConnect">
             <f:checkbox title="${%Enable Sauce Connect?}" default="checked"/>
         </f:entry>
@@ -24,6 +25,7 @@
                 <f:password value="${credentials.apiKey}"/>
             </f:entry>
         </f:optionalBlock>
+        </f:section>
         <f:section title="Sauce Connect Advanced Options">
             <f:advanced>
                 <f:entry title="${%Sauce OnDemand Host}" field="seleniumHost">