[arvados-dev] created: 422bcaaf6d461903110ed7d5726ef863f81a94c5
git repository hosting
git at public.arvados.org
Thu Oct 19 18:16:37 UTC 2023
at 422bcaaf6d461903110ed7d5726ef863f81a94c5 (commit)
commit 422bcaaf6d461903110ed7d5726ef863f81a94c5
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date: Thu Oct 19 15:06:44 2023 -0300
Adds procps package so that sysctl can be used. Refs #21055
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/jenkins/packer-images/jenkins-image-common.sh b/jenkins/packer-images/jenkins-image-common.sh
index e68b092..22176a7 100755
--- a/jenkins/packer-images/jenkins-image-common.sh
+++ b/jenkins/packer-images/jenkins-image-common.sh
@@ -31,7 +31,7 @@ case ${OS_ID} in
POSTINSTALL_CMD="DEBIAN_FRONTEND=noninteractive apt-get purge --autoremove -y"
# SUFFIX packages with - to remove them
# Remove unattended-upgrades so that it doesn't interfere with our nodes at startup
- PKGS="git netcat-traditional default-jdk unattended-upgrades-"
+ PKGS="git netcat-traditional default-jdk unattended-upgrades- procps"
;;
esac
diff --git a/jenkins/packer-images/jenkins-image-workbench2.sh b/jenkins/packer-images/jenkins-image-workbench2.sh
index fec1fd6..15e43ef 100755
--- a/jenkins/packer-images/jenkins-image-workbench2.sh
+++ b/jenkins/packer-images/jenkins-image-workbench2.sh
@@ -19,7 +19,7 @@ fi
# React uses a lot of filesystem watchers (via inotify). Increase the default
# so we have a higher limit at runtime.
echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
-sysctl -p
+sudo sysctl -p
# Build the workbench2-build docker image
sudo make workbench2-build-image
commit f32a71261102cc3e37d08fe6e80adf99dfc9607f
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date: Thu Oct 19 13:03:26 2023 -0300
Adds `sysctl -p` to wb2 jenkins script. Refs #21055
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/jenkins/packer-images/jenkins-image-workbench2.sh b/jenkins/packer-images/jenkins-image-workbench2.sh
index af4d708..fec1fd6 100755
--- a/jenkins/packer-images/jenkins-image-workbench2.sh
+++ b/jenkins/packer-images/jenkins-image-workbench2.sh
@@ -19,6 +19,7 @@ fi
# React uses a lot of filesystem watchers (via inotify). Increase the default
# so we have a higher limit at runtime.
echo fs.inotify.max_user_watches=524288 | sudo tee -a /etc/sysctl.conf
+sysctl -p
# Build the workbench2-build docker image
sudo make workbench2-build-image
commit 36b12e348679a8cb206d59dfd9c4d8b9ad0b7d1f
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date: Tue Oct 17 17:35:53 2023 -0300
Updates packer to latest. No issue #
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/jenkins/packer-images/jenkins-image-with-docker.sh b/jenkins/packer-images/jenkins-image-with-docker.sh
index 8243c21..5c4d40e 100755
--- a/jenkins/packer-images/jenkins-image-with-docker.sh
+++ b/jenkins/packer-images/jenkins-image-with-docker.sh
@@ -12,8 +12,8 @@ sudo usermod -a -G docker jenkins
#Packer install
cd /tmp
-wget https://releases.hashicorp.com/packer/1.8.0/packer_1.8.0_linux_amd64.zip
-unzip packer_1.8.0_linux_amd64.zip packer
+wget https://releases.hashicorp.com/packer/1.9.4/packer_1.9.4_linux_amd64.zip
+unzip packer_1.9.4_linux_amd64.zip packer
sudo mv packer /usr/local/bin/
# Install the arvados-dev repo where the Jenkins job expects it
commit 5d7f54dbc0b62661457c8ca67a03245f8495a613
Author: Lucas Di Pentima <lucas at di-pentima.com.ar>
Date: Tue Oct 17 15:21:56 2023 -0300
Sets timeout to 1 hour. Updates base image. Refs #21055.
Arvados-DCO-1.1-Signed-off-by: Lucas Di Pentima <lucas.dipentima at curii.com>
diff --git a/jenkins/packer-images/jenkins-image-workbench2.json b/jenkins/packer-images/jenkins-image-workbench2.json
index e916979..94e3754 100644
--- a/jenkins/packer-images/jenkins-image-workbench2.json
+++ b/jenkins/packer-images/jenkins-image-workbench2.json
@@ -8,12 +8,13 @@
"type": "googlecompute",
"account_file": "{{user `key_file` }}",
"project_id": "phoenix-project-42-ci",
- "source_image": "debian-10-buster-v20210916",
+ "source_image": "debian-10-buster-v20231010",
"zone": "us-central1-b",
"disk_size": "20",
"image_name": "jenkins-image-workbench2-{{isotime \"20060102150405\"}}",
"image_family": "jenkins",
- "ssh_username": "jenkins"
+ "ssh_username": "jenkins",
+ "state_timeout": "1h"
}
],
"provisioners": [
-----------------------------------------------------------------------
hooks/post-receive
--
More information about the arvados-commits
mailing list