From a847c9890091a0a3c260c00162e6fb02c2d0d006 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taavi=20V=C3=A4=C3=A4n=C3=A4nen?= Date: Tue, 23 Sep 2025 16:38:55 +0300 Subject: [PATCH 1/3] singleuser: Make build fail if 'sql' tool fails to fetch --- images/singleuser/install-sql-tool | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/images/singleuser/install-sql-tool b/images/singleuser/install-sql-tool index 5595677e..8a031c8b 100755 --- a/images/singleuser/install-sql-tool +++ b/images/singleuser/install-sql-tool @@ -1,7 +1,8 @@ #!/bin/bash +set -e curl \ 'https://gitlab.wikimedia.org/repos/cloud/toolforge/misctools-cli/-/raw/master/misctools/sql?ref_type=heads' \ - --fail-with-body \ + --fail \ --output /srv/paws/bin/sql chmod 755 /srv/paws/bin/sql From f9025609934e1a211c73b3f9c3742b81d01e372f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Taavi=20V=C3=A4=C3=A4n=C3=A4nen?= Date: Tue, 23 Sep 2025 16:39:29 +0300 Subject: [PATCH 2/3] singleuser: Update branch name for sql tool Bug: T405229 --- images/singleuser/install-sql-tool | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/images/singleuser/install-sql-tool b/images/singleuser/install-sql-tool index 8a031c8b..67f08ba9 100755 --- a/images/singleuser/install-sql-tool +++ b/images/singleuser/install-sql-tool @@ -2,7 +2,7 @@ set -e curl \ - 'https://gitlab.wikimedia.org/repos/cloud/toolforge/misctools-cli/-/raw/master/misctools/sql?ref_type=heads' \ + 'https://gitlab.wikimedia.org/repos/cloud/toolforge/misctools-cli/-/raw/main/misctools/sql?ref_type=heads' \ --fail \ --output /srv/paws/bin/sql chmod 755 /srv/paws/bin/sql From 8fdc9457ff878fb36d18e14c4080ff2975da668a Mon Sep 17 00:00:00 2001 From: Github Action Date: Tue, 23 Sep 2025 13:41:01 +0000 Subject: [PATCH 3/3] auto update of tag --- paws/values.yaml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/paws/values.yaml b/paws/values.yaml index bf0a1324..abb4e921 100644 --- a/paws/values.yaml +++ b/paws/values.yaml @@ -276,7 +276,7 @@ jupyterhub: fsGid: 52771 image: name: quay.io/wikimedia-paws-prod/singleuser - tag: pr-497 # singleuser tag managed by github actions + tag: pr-500 # singleuser tag managed by github actions pullPolicy: Always memory: guarantee: 0.70G