From 0ae38701d9f46c121c1af5d31e2d610e63efd9e2 Mon Sep 17 00:00:00 2001 From: David Caro Date: Mon, 30 Jun 2025 17:16:39 +0200 Subject: [PATCH 1/3] sql: install from gitlab The misctools repo moved to gitlab Bug: T398202 Signed-off-by: David Caro --- images/singleuser/install-sql-tool | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/images/singleuser/install-sql-tool b/images/singleuser/install-sql-tool index d8f9501b..eacf5c73 100755 --- a/images/singleuser/install-sql-tool +++ b/images/singleuser/install-sql-tool @@ -1,4 +1,7 @@ #!/bin/bash -curl https://gerrit.wikimedia.org/r/plugins/gitiles/labs/toollabs/+/refs/heads/master/misctools/sql?format=TEXT | base64 -d > /srv/paws/bin/sql +curl \ + 'https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-misctools/-/raw/master/misctools/sql?ref_type=heads' \ + --fail-with-body \ + --output /srv/paws/bin/sql chmod 755 /srv/paws/bin/sql From cb5d7ec7d70aeeeb0b8a903a6557a4ece8cf2428 Mon Sep 17 00:00:00 2001 From: Github Action Date: Mon, 30 Jun 2025 15:19:58 +0000 Subject: [PATCH 2/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 b4a0593e..0c6429d5 100644 --- a/paws/values.yaml +++ b/paws/values.yaml @@ -280,7 +280,7 @@ jupyterhub: fsGid: 52771 image: name: quay.io/wikimedia-paws-prod/singleuser - tag: pr-486 # singleuser tag managed by github actions + tag: pr-489 # singleuser tag managed by github actions pullPolicy: Always memory: guarantee: 0.70G From bdc6a1de6cb02ccbd61d50f2e4a5bfc4ee61216a Mon Sep 17 00:00:00 2001 From: David Caro Date: Tue, 8 Jul 2025 17:15:03 +0200 Subject: [PATCH 3/3] Update images/singleuser/install-sql-tool MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Taavi Väänänen --- 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 eacf5c73..5595677e 100755 --- a/images/singleuser/install-sql-tool +++ b/images/singleuser/install-sql-tool @@ -1,7 +1,7 @@ #!/bin/bash curl \ - 'https://gitlab.wikimedia.org/repos/cloud/toolforge/toolforge-misctools/-/raw/master/misctools/sql?ref_type=heads' \ + 'https://gitlab.wikimedia.org/repos/cloud/toolforge/misctools-cli/-/raw/master/misctools/sql?ref_type=heads' \ --fail-with-body \ --output /srv/paws/bin/sql chmod 755 /srv/paws/bin/sql