ubuntu14.04: Remove the extra gyp slaves

We now use tags in jenkins to check if a slave should be running a gyp build or not.
JaneaSystems · Dec 23, 2015 · a45747d · a45747d
1 parent cfbb5d4
commit a45747d
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 11 deletions.
diff --git a/setup/ubuntu14.04/ansible-playbook.yaml b/setup/ubuntu14.04/ansible-playbook.yaml
@@ -55,7 +55,7 @@
       tags: user
 
     - name: GYP | Clone the GYP repo
-      command: rm -rf /home/{{ server_user }}/gyp && git clone http://git.chromium.org/external/gyp.git /home/{{ server_user }}/gyp
+      command: rm -rf /home/{{ server_user }}/gyp && git clone http://git.chromium.org/external/gyp /home/{{ server_user }}/gyp
       tags: gyp
 
     - name: Jenkins | Download Jenkins' slave.jar
@@ -70,15 +70,6 @@
       replace: dest=/home/{{ server_user }}/start.sh regexp="\{\{secret\}\}" replace="{{ server_secret }}"
       tags: jenkins
 
-    - name: Jenkins | Copy GYP secret to start.sh script
-      replace: dest=/home/{{ server_user }}/start.sh regexp="\{\{gyp_secret\}\}" replace="{{ gyp_server_secret }}"
-      tags: jenkins
-
     - name: Jenkins | Copy server id to start.sh script
       replace: dest=/home/{{ server_user }}/start.sh regexp="\{\{id\}\}" replace="{{ server_id }}"
       tags: jenkins
-
-    - name: Jenkins | Copy server GYP id to start.sh script
-      replace: dest=/home/{{ server_user }}/start.sh regexp="\{\{gyp_id\}\}" replace="{{ gyp_server_id }}"
-      tags: jenkins
-
diff --git a/setup/ubuntu14.04/resources/start.sh b/setup/ubuntu14.04/resources/start.sh
@@ -2,4 +2,3 @@
 
 rm -f nohup.out
 PATH=/usr/lib/ccache/:$PATH NODE_COMMON_PIPE=/home/iojs/test.pipe OSTYPE=linux-gnu nohup java -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/{{id}}/slave-agent.jnlp -secret {{secret}} &
-PATH=/usr/lib/ccache/:$PATH OSTYPE=linux-gnu-gyp nohup java -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/{{gyp_id}}/slave-agent.jnlp -secret {{gyp_secret}} &
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,3 @@

		rm -f nohup.out
		PATH=/usr/lib/ccache/:$PATH NODE_COMMON_PIPE=/home/iojs/test.pipe OSTYPE=linux-gnu nohup java -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/{{id}}/slave-agent.jnlp -secret {{secret}} &
		PATH=/usr/lib/ccache/:$PATH OSTYPE=linux-gnu-gyp nohup java -jar slave.jar -jnlpUrl https://ci.nodejs.org/computer/{{gyp_id}}/slave-agent.jnlp -secret {{gyp_secret}} &