diff options
| -rw-r--r-- | TODO | 4 | ||||
| -rwxr-xr-x | update_jdn.sh | 33 |
2 files changed, 22 insertions, 15 deletions
@@ -210,10 +210,8 @@ properties: * status of remote build nodes for amd64 ** profitbricks-build1-amd64 is setup *** squid needs proper configuration -*** tmpfs needs to be set up ** profitbricks-build1-amd64 is setup *** squid needs proper configuration -*** tmpfs needs to be set up *** should run in the future: +1d+1m+1y * profitbricks-build2-amd64 will also host a VM (profitbricks-build2-amd64, so we will be running kvm on kvm there) ** networking doesnt work yet, so profitbricks-build3-amd64 aint accessable atm - help welcome! @@ -354,7 +352,7 @@ properties: ** we build with sudo too *** change /usr/obj to be '~jenkins/obj' and build with WITH_INSTALL_AS_USER ? * first build world, later build ports (pkg info...) -* investigate how to use tmpfs on freebsd and build there? +* investigate how to use tmpfs on freebsd and build there ==== reproducible... diff --git a/update_jdn.sh b/update_jdn.sh index bc7f4ec6..5ba411e6 100755 --- a/update_jdn.sh +++ b/update_jdn.sh @@ -46,19 +46,28 @@ sudo mkdir -p /srv/workspace [ -h /chroots ] || sudo ln -s /srv/workspace/chroots /chroots [ -h /schroots ] || sudo ln -s /srv/schroots /schroots -if [ "$HOSTNAME" = "jenkins" ] ; then - if ! grep -q '^tmpfs\s\+/srv/workspace\s' /etc/fstab; then - echo "tmpfs /srv/workspace tmpfs defaults,size=100g 0 0" >> /etc/fstab - fi - - if ! mountpoint -q /srv/workspace; then - if test -z "$(ls -A /srv/workspace)"; then - mount /srv/workspace - else - explain "mountpoint /srv/workspace is non-empty." +# prepare tmpfs on some hosts +case $HOSTNAME in + jenkins) TMPFSSIZE=100 ;; + profitbricks-build?-amd64) TMPFSSIZE=60 ;; + profitbricks-build4-amd64) TMPFSSIZE=10 ;; + *) ;; +esac +case $HOSTNAME in + jenkins|profitbricks-build?-amd64) + if ! grep -q '^tmpfs\s\+/srv/workspace\s' /etc/fstab; then + echo "tmpfs /srv/workspace tmpfs defaults,size=${TMPFSSIZE}g 0 0" >> /etc/fstab fi - fi -fi + if ! mountpoint -q /srv/workspace; then + if test -z "$(ls -A /srv/workspace)"; then + mount /srv/workspace + else + explain "mountpoint /srv/workspace is non-empty." + fi + fi + ;; + *) ;; +esac # make sure needed directories exists - some directories will not be needed on all hosts... for directory in /schroots /srv/reproducible-results /srv/d-i /srv/live-build /var/log/jenkins/ /srv/jenkins /srv/jenkins/pseudo-hosts /srv/workspace/chroots ; do |