Run generate workspace and project on slaves.

Accenture · Mar 2, 2017 · 245d5b5 · 245d5b5
1 parent c9d3c9c
commit 245d5b5
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 5 deletions.
diff --git a/bootstrap/Workspace_Management/Generate_Workspace.groovy b/bootstrap/Workspace_Management/Generate_Workspace.groovy
@@ -23,7 +23,7 @@ generateWorkspaceJob.with{
         stringParam("DEVELOPER_USERS","","The list of users' email addresses that should be setup initially as developers. They will have full access to all non-admin jobs within the project.")
         stringParam("VIEWER_USERS","","The list of users' email addresses that should be setup initially as viewers. They will have read-only access to all non-admin jobs within the project.")
     }
-    label("ldap")
+    label("!master")
     wrappers {
         preBuildCleanup()
         injectPasswords()

diff --git a/projects/jobs/jobs.groovy b/projects/jobs/jobs.groovy
@@ -112,7 +112,7 @@ return cartridge_urls;
         maskPasswords()
         credentialsBinding {
             file('SCM_SSH_KEY', 'adop-jenkins-private')
-        }        
+        }
         copyToSlaveBuildWrapper {
           includes("**/**")
           excludes("")
@@ -122,7 +122,7 @@ return cartridge_urls;
           hudsonHomeRelative(false)
         }
     }
-    label("!master")
+    label("docker")
     steps {
         shell('''#!/bin/bash -ex
 
@@ -180,7 +180,7 @@ if(credentialId != null){
 
   channel = build.workspace.channel;
   fp = new FilePath(channel, build.workspace.toString() + "@tmp/secretFiles/" + build.getEnvVars()["SCM_KEY"])
-  fp.write("SCM_USERNAME="+credentialInfo[0]+"\\nSCM_PASSWORD="+credentialInfo[1], null);  
+  fp.write("SCM_USERNAME="+credentialInfo[0]+"\\nSCM_PASSWORD="+credentialInfo[1], null);
 
 }
 '''){

diff --git a/workspaces/jobs/jobs.groovy b/workspaces/jobs/jobs.groovy
@@ -28,7 +28,7 @@ generateProjectJob.with{
         stringParam("DEVELOPER_USERS","","The list of users' email addresses that should be setup initially as developers. They will have full access to all non-admin jobs within the project.")
         stringParam("VIEWER_USERS","","The list of users' email addresses that should be setup initially as viewers. They will have read-only access to all non-admin jobs within the project.")
     }
-    label("ldap")
+    label("docker")
     environmentVariables {
         env('WORKSPACE_NAME',workspaceFolderName)
     }