[Qa-jenkins-scm] [Git][qa/jenkins.debian.net][master] 2 commits: else we dont match node workspace names

[Holger Levsen]

Holger Levsen pushed to branch master at Debian QA / jenkins.debian.net


Commits:
fecb067f by Holger Levsen at 2018-11-07T13:27:37Z
else we dont match node workspace names

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -
a34ba43f by Holger Levsen at 2018-11-07T13:40:32Z
nope...

Signed-off-by: Holger Levsen <holger at layer-acht.org>

- - - - -


3 changed files:

- bin/start-slave.sh
- hosts/jenkins/etc/default/jenkins
- jenkins-home/offline_nodes


Changes:

=====================================
bin/start-slave.sh
=====================================
@@ -17,7 +17,7 @@ if [ -f "$f" ]; then
 fi
 
 echo "This jenkins slave.jar will run as PID $$."
-export JAVA_ARGS="-Xmn128M -Xms1G -Xmx1G -client"
-export MALLOC_ARENA_MAX=1
-sleep 120m
+#export JAVA_ARGS="-Xmn128M -Xms1G -Xmx1G -client"
+export JAVA_ARGS="-Xmx2G"
+#export MALLOC_ARENA_MAX=1
 exec java $JAVA_ARGS -jar /var/lib/jenkins/slave.jar


=====================================
hosts/jenkins/etc/default/jenkins
=====================================
@@ -16,9 +16,10 @@ JAVA_ARGS="-Djava.awt.headless=true"
 
 #JAVA_ARGS="-Djava.net.preferIPv4Stack=true" # make jenkins listen on IPv4 address
 # See some recommendation from https://jenkins.io/blog/2016/11/21/gc-tuning/
-JAVA_ARGS="$JAVA_ARGS -Xmn1G -Xms24G -Xmx24G"  # heap settings
-JAVA_ARGS="$JAVA_ARGS -server "
-JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch"
+JAVA_ARGS="$JAVA_ARGS -Xmx16G"  # heap settings
+#JAVA_ARGS="$JAVA_ARGS -Xmn1G -Xms24G -Xmx24G"  # heap settings
+#JAVA_ARGS="$JAVA_ARGS -server "
+#JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch"
 # store heap dumps in case of OOM, to investigate it later
 #JAVA_ARGS="$JAVA_ARGS -XX:+HeapDumpOnOutOfMemoryError -XX:HeapDumpPath=$JENKINS_HOME/heapDumps/"
 # GC logging, in case somebody ever wants to actually finely tune the GC for us...
@@ -27,11 +28,11 @@ JAVA_ARGS="$JAVA_ARGS -XX:+AlwaysPreTouch"
 #JAVA_ARGS="$JAVA_ARGS -XX:+PrintGCDateStamps -XX:+PrintGCDetails -XX:+PrintHeapAtGC"
 #JAVA_ARGS="$JAVA_ARGS -XX:+PrintGCCause -XX:+PrintTenuringDistribution -XX:+PrintReferenceGC -XX:+PrintAdaptiveSizePolicy"
 # G1 GC settings
-JAVA_ARGS="$JAVA_ARGS -XX:+UseG1GC "
+#JAVA_ARGS="$JAVA_ARGS -XX:+UseG1GC "
 #JAVA_ARGS="$JAVA_ARGS -XX:+ExplicitGCInvokesConcurrent -XX:+ParallelRefProcEnabled -XX:+UseStringDeduplication"
 #JAVA_ARGS="$JAVA_ARGS -XX:+UnlockExperimentalVMOptions -XX:G1NewSizePercent=10 -XX:+UnlockDiagnosticVMOptions -XX:G1SummarizeRSetStatsPeriod=1"
 # h01ger trying stuff
-export MALLOC_ARENA_MAX=1
+#export MALLOC_ARENA_MAX=1
 
 # make jenkins listen on IPv4 address
 #JAVA_ARGS="-Djava.net.preferIPv4Stack=true"


=====================================
jenkins-home/offline_nodes
=====================================
@@ -3,5 +3,7 @@
 # as offline in the jenkins UI.
 
 jtk1b-armhf-rb.debian.net
+jtk1b-armhf-rb
 ff64a-armhf-rb.debian.net
+ff64a-armhf-rb
 



View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4a8dc96d6a873195a4981f8ce90fa3c5a1ab1138...a34ba43f3bdf9539c3799a7d23341e879852ab72

-- 
View it on GitLab: https://salsa.debian.org/qa/jenkins.debian.net/compare/4a8dc96d6a873195a4981f8ce90fa3c5a1ab1138...a34ba43f3bdf9539c3799a7d23341e879852ab72
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/qa-jenkins-scm/attachments/20181107/47e88f69/attachment-0001.html>