From 35fcdab564029fe71ae7a11576a7288f403ef7d0 Mon Sep 17 00:00:00 2001
From: roti <robert.timm@wikimedia.de>
Date: Wed, 6 Mar 2024 07:56:45 +0000
Subject: [PATCH 01/32] chore: update variables.env

---
 variables.env | 86 ++++++++++++++++++++++++++++-----------------------
 1 file changed, 47 insertions(+), 39 deletions(-)

diff --git a/variables.env b/variables.env
index 99e00e01b..e1c794080 100644
--- a/variables.env
+++ b/variables.env
@@ -7,7 +7,7 @@
 # Append -prerelease while working on releases.
 # Remove -prerelease when ready to merge release to the release branch.
 # Call it main on the main branch.
-WMDE_RELEASE_VERSION=main
+WMDE_RELEASE_VERSION=wmde.17
 
 
 # ##############################################################################
@@ -16,8 +16,8 @@ WMDE_RELEASE_VERSION=main
 # Update only patch versions for security releases.
 # Choose latest version for major releases.
 # https://hub.docker.com/_/mediawiki
-MEDIAWIKI_VERSION=1.40.2
-MEDIAWIKI_IMAGE_URL=mediawiki:1.40.2
+MEDIAWIKI_VERSION=1.41.0
+MEDIAWIKI_IMAGE_URL=mediawiki:1.41.0
 
 
 # ##############################################################################
@@ -49,8 +49,8 @@ ELASTICSEARCH_IMAGE_URL=docker.elastic.co/elasticsearch/elasticsearch:7.10.2
 # Update to latest for major releases.
 #
 # https://central.sonatype.com/artifact/org.wikimedia.search/extra
-# https://github.com/wikimedia/search-extra/compare/extra-parent-7.10.2-wmf4...extra-parent-7.10.2-wmf10
-ELASTICSEARCH_PLUGIN_WIKIMEDIA_EXTRA=7.10.2-wmf4
+# https://github.com/wikimedia/search-extra/compare/extra-parent-7.10.2-wmf4...extra-parent-7.10.2-wmf12
+ELASTICSEARCH_PLUGIN_WIKIMEDIA_EXTRA=7.10.2-wmf12
 
 # https://central.sonatype.com/artifact/org.wikimedia.search.highlighter/experimental-highlighter-elasticsearch-plugin
 ELASTICSEARCH_PLUGIN_WIKIMEDIA_HIGHLIGHTER=7.10.2
@@ -76,14 +76,15 @@ COMPOSER_IMAGE_URL=docker-registry.wikimedia.org/releng/composer-php82:0.1.0-s3
 # https://mariadb.org/mariadb/all-releases/
 MARIADB_IMAGE_URL=mariadb:10.11
 
-# https://hub.docker.com/_/nginx 
-NGINX_IMAGE_URL=nginx:1.25.3-bookworm
+# https://hub.docker.com/_/nginx
+NGINX_IMAGE_URL=nginx:1.25.4-bookworm
 
 # https://hub.docker.com/_/node
 NODE_IMAGE_URL=node:20.11.1-bookworm
 
+# https://www.php.net/supported-versions.php
 # https://hub.docker.com/_/php
-PHP_IMAGE_URL=php:8.1.27-apache-bookworm
+PHP_IMAGE_URL=php:8.2.15-apache-bookworm
 
 # https://hub.docker.com/_/eclipse-temurin
 # https://github.com/docker-library/docs/tree/master/eclipse-temurin/README.md#supported-tags-and-respective-dockerfile-links
@@ -96,6 +97,13 @@ JRE_IMAGE_URL=eclipse-temurin:8u402-b06-jre-jammy
 DEBIAN_IMAGE_URL=debian:bookworm-slim
 
 
+# ******************************************************************************
+# ******************************************************************************
+# Versions below are automatically updated by ./build.sh update_hashes
+# ******************************************************************************
+# ******************************************************************************
+
+
 # ##############################################################################
 # WMF maintained extensions
 # ##############################################################################
@@ -103,36 +111,36 @@ DEBIAN_IMAGE_URL=debian:bookworm-slim
 # Versions in REL_ branches ensure compatibility with respective mediawiki versions.
 # Shouldn't require much of a review.
 #
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_40
-WIKIBASE_COMMIT=903c3f9d0513d4e847727d73b0ab5c742c2d2f09
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_40
-BABEL_COMMIT=43e9555fb5ffc00dfc76dd32aa12febe483d39d3
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_40
-CLDR_COMMIT=ac9ad554535c7160bd982be0cce1b9a73890bc46
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_40
-CIRRUSSEARCH_COMMIT=9a51bae5915b6fc20cbaa80f5b3dbe12e738ed86
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_40
-CONFIRMEDIT_COMMIT=d4075f7e67aaea04627703e1c4f08743196d7854
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_40
-ELASTICA_COMMIT=b3b7675e8208f28fbf0a7939c108acf3e301656e
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_40
-ENTITYSCHEMA_COMMIT=597c8bbd32810605262df7f2f9d20d02d8b7552f
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_40
-NUKE_COMMIT=220878a258fbfb1a4ef48b049ea1364816ef3149
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_40
-OAUTH_COMMIT=0b21f8acdf38d5d9b19fb42197e07211925d0541
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_40
-SCRIBUNTO_COMMIT=89255870fd6a8f3aa98782cc5260d2f1c0b2ad4d
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_40
-SYNTAXHIGHLIGHT_GESHI_COMMIT=79787a3234b293f57482de4964a802375256403e
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_40
-UNIVERSALLANGUAGESELECTOR_COMMIT=de7670d2217316401b7d38735a7be0e4482f1b42
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_40
-VISUALEDITOR_COMMIT=00b627cb83f95a6dc62c640969429ab99c8cad2e
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_40
-WIKIBASECIRRUSSEARCH_COMMIT=c88e34b0b2f6dbeb7f69cacdd40d95e6101f9807
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_40
-WIKIBASEMANIFEST_COMMIT=10f0ddcb7eac28f56999f983f169cf7b1c6e240a
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_41
+WIKIBASE_COMMIT=f0db2a7752920e7504b315f1340de08c28dd20d0
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_41
+BABEL_COMMIT=8dfd0eb9dd701be05b261f89372d2be17e055b04
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_41
+CLDR_COMMIT=cad7768c4bd092318067fe15d674bf17ff965e2a
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_41
+CIRRUSSEARCH_COMMIT=3908adfa292be2066f53e7d7f8adbd9700130c9c
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_41
+CONFIRMEDIT_COMMIT=4dbae6dfe9144368d336f4b91cc9cd3eeaa0fcfe
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_41
+ELASTICA_COMMIT=24f94b80b51555e5e5b30b0633d215ee001650d4
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_41
+ENTITYSCHEMA_COMMIT=85ea615968509afab9214c572ac7aedc7dda4424
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_41
+NUKE_COMMIT=7c98e7c986ebe3cc031b5da2c6286e3326eaad2c
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_41
+OAUTH_COMMIT=c74524cdb947cabd34b955b654ac00884d4ad4c0
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_41
+SCRIBUNTO_COMMIT=d9df5c18b906158411fb92368235ee4a33442aa6
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_41
+SYNTAXHIGHLIGHT_GESHI_COMMIT=40908dd4204915eb20f1e43161c0489c7571f37d
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_41
+UNIVERSALLANGUAGESELECTOR_COMMIT=398865dd9c35baa1de1cd6a166d5bc6ad948467e
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_41
+VISUALEDITOR_COMMIT=99d5ed141f1d3a0d0d1bf6416587fd7a1beccd8a
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_41
+WIKIBASECIRRUSSEARCH_COMMIT=7a4fdf2342eaecee9217e430d702c03c66dab55c
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_41
+WIKIBASEMANIFEST_COMMIT=8c7cdae4d5a1e68b19fcca8eb5c2a7b6e3dc3e55
 
 
 # ##############################################################################
@@ -159,7 +167,7 @@ MAGNUSTOOLS_COMMIT=5b8cea412000072a2c8753023c11472a4ac11ef5
 # No versioning scheme. Review changes carefully.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/gui/+/refs/heads/master
-WDQSQUERYGUI_COMMIT=4f355e5e1ee4747471b6cedb2fc78fe29f9c8cb7
+WDQSQUERYGUI_COMMIT=751e5dc0e4154e36d4413ad96bc3a01b950dfef7
 
 
 # ##############################################################################

From 55d9cbbc5cfa76f463b19d0a2a0c356c7aaea2af Mon Sep 17 00:00:00 2001
From: roti <robert.timm@wikimedia.de>
Date: Wed, 6 Mar 2024 07:56:55 +0000
Subject: [PATCH 02/32] docs: update changes.md

---
 CHANGES.md | 9 +++++++++
 1 file changed, 9 insertions(+)

diff --git a/CHANGES.md b/CHANGES.md
index e0bf7a357..6cc545b41 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -3,6 +3,15 @@
 This file is only intended to serve the developers of this repository and of the releases.
 This provides an overview of the releases that have been made using this release pipeline.
 
+## March 2024: Mayor releases for 1.41.0
+- [MediaWiki release announcement: 1.41.0](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/OMDFHJ2SKKJH775RW4UTC754OY4TP7UU/)
+- [MediaWiki full release notes](https://www.mediawiki.org/wiki/Release_notes/1.41)
+- [Wikibase Suite Release task T354644](https://phabricator.wikimedia.org/T354644)
+
+| Suite Version | Version Info | Date available | Release task  |
+|---------------|----------------------|----------------|------------| --------------|
+| wmde.17 ([spec](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.17/variables.env)) | MediaWiki (1.41.0, PHP 8.2.15, debian/apache 2.4.57-2), WDQS (0.3.137)    | 06 March 2024 | [T354644](https://phabricator.wikimedia.org/T354644) |
+
 ## February 2024: Security releases for 1.40.2
 - [MediaWiki security and maintenance release announcement: 1.35.14 / 1.39.6 / 1.40.2](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/TDBUBCCOQJUT4SCHJNPHKQNPBUUETY52/)
 - [MediaWiki full release notes](https://www.mediawiki.org/wiki/Release_notes/1.40)

From 2bdec19ccb1c8a69d7b2a5ef42e0f30f0b319ea3 Mon Sep 17 00:00:00 2001
From: roti <robert.timm@wikimedia.de>
Date: Wed, 6 Mar 2024 08:04:59 +0000
Subject: [PATCH 03/32] fix: local test run be reverting change from "npm
 update" branch

---
 test/setup/loadEnvFiles.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/setup/loadEnvFiles.ts b/test/setup/loadEnvFiles.ts
index 8bc28d618..61573ee1d 100644
--- a/test/setup/loadEnvFiles.ts
+++ b/test/setup/loadEnvFiles.ts
@@ -19,7 +19,7 @@ function loadEnvFile(
 	const envVars = { ...providedEnvvars, ...envVarsFromFile };
 	const { parsed: expandedEnvVars } = dotenvExpand.expand( {
 		parsed: envVars,
-		processEnv: {}
+		ignoreProcessEnv: true
 	} );
 
 	return expandedEnvVars;

From efed7b9ef80251fca9c9c49132154fba6dfaa466 Mon Sep 17 00:00:00 2001
From: roti <robert.timm@wikimedia.de>
Date: Wed, 6 Mar 2024 08:07:02 +0000
Subject: [PATCH 04/32] chore: rename release to main for now

---
 variables.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.env b/variables.env
index e1c794080..142aabbe3 100644
--- a/variables.env
+++ b/variables.env
@@ -7,7 +7,7 @@
 # Append -prerelease while working on releases.
 # Remove -prerelease when ready to merge release to the release branch.
 # Call it main on the main branch.
-WMDE_RELEASE_VERSION=wmde.17
+WMDE_RELEASE_VERSION=main
 
 
 # ##############################################################################

From 2b3d0aaa80a66b33147be0e42419dad8a45a6d50 Mon Sep 17 00:00:00 2001
From: roti <robert.timm@wikimedia.de>
Date: Wed, 6 Mar 2024 08:24:24 +0000
Subject: [PATCH 05/32] fix: property tests for 1.41

---
 test/specs/repo/property.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/specs/repo/property.ts b/test/specs/repo/property.ts
index ad444440c..1afbc3b6e 100644
--- a/test/specs/repo/property.ts
+++ b/test/specs/repo/property.ts
@@ -89,6 +89,7 @@ describe( 'Property', function () {
 
 			it( 'Should display the added properties on the "Recent changes" page', async function () {
 				await browser.waitForJobs();
+				await $( '.vector-main-menu-dropdown' ).click();
 				await $( '=Recent changes' ).click();
 				await expect( $( `=(${ propertyId })` ) ).toExist();
 				await expect( $( `=(${ stringPropertyId })` ) ).toExist();
@@ -120,7 +121,7 @@ describe( 'Property', function () {
 				await page.open( '/wiki/Special:SetLabelDescriptionAliases/' );
 				await $( 'label=ID:' ).click();
 				await browser.keys( propertyId.split( '' ) );
-				await $( 'span=Set label, description and aliases' ).click();
+				await $( 'span=Continue' ).click();
 
 				await $( 'label=Label:' ).click();
 				await browser.keys( `${ dataType.name } Label`.split( '' ) );
@@ -131,7 +132,7 @@ describe( 'Property', function () {
 					`${ dataType.name } Alias A|${ dataType.name } Alias B`.split( '' )
 				);
 
-				await $( 'span=Set label, description and aliases' ).click();
+				await $( 'span=Save changes' ).click();
 
 				await expect(
 					$( `span.wikibase-labelview-text=${ dataType.name } Label` )

From 58c758d97be8a04e5dec4d1272cdce7f35abe22c Mon Sep 17 00:00:00 2001
From: roti <robert.timm@wikimedia.de>
Date: Wed, 6 Mar 2024 14:28:15 +0100
Subject: [PATCH 06/32] Revert "fix: local test run be reverting change from
 "npm update" branch"

This reverts commit 2bdec19ccb1c8a69d7b2a5ef42e0f30f0b319ea3.
---
 test/setup/loadEnvFiles.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/setup/loadEnvFiles.ts b/test/setup/loadEnvFiles.ts
index 61573ee1d..8bc28d618 100644
--- a/test/setup/loadEnvFiles.ts
+++ b/test/setup/loadEnvFiles.ts
@@ -19,7 +19,7 @@ function loadEnvFile(
 	const envVars = { ...providedEnvvars, ...envVarsFromFile };
 	const { parsed: expandedEnvVars } = dotenvExpand.expand( {
 		parsed: envVars,
-		ignoreProcessEnv: true
+		processEnv: {}
 	} );
 
 	return expandedEnvVars;

From 969faf87b0c401d4d806236af6dfa62dc28e8e7b Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Thu, 14 Mar 2024 13:09:42 +0100
Subject: [PATCH 07/32] Failing

---
 test/specs/repo/queryservice.ts | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/test/specs/repo/queryservice.ts b/test/specs/repo/queryservice.ts
index 6ef210271..f2a6d0d98 100644
--- a/test/specs/repo/queryservice.ts
+++ b/test/specs/repo/queryservice.ts
@@ -131,6 +131,21 @@ describe( 'QueryService', function () {
 		// TODO make an item using the UI
 		const itemId = await WikibaseApi.createItem( getTestString( 'T267743-' ) );
 
+		// Check it shows up after creation
+		await QueryServiceUIPage.open( `SELECT * WHERE{ wd:${ itemId } ?p ?o }` );
+
+		// wait for WDQS-updater
+		// eslint-disable-next-line wdio/no-pause
+		await browser.pause( 20 * 1000 );
+
+		await QueryServiceUIPage.submit();
+		await QueryServiceUIPage.resultTable;
+
+		await expect(
+			QueryServiceUIPage.resultIncludes( 'schema:version' )
+		).resolves.toBe( true );
+
+		// Attempt to delete
 		await LoginPage.login(
 			testEnv.vars.MW_ADMIN_NAME,
 			testEnv.vars.MW_ADMIN_PASS

From 3019b31a7377cc78168a2348a7c35197dd22c486 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Thu, 14 Mar 2024 13:45:18 +0100
Subject: [PATCH 08/32] button

---
 test/helpers/pages/queryservice-ui/queryservice-ui.page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
index 8b17798c0..78f712f86 100644
--- a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
+++ b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
@@ -2,7 +2,7 @@ import SubmittablePage from '../submittable.page.js';
 
 class QueryServiceUIPage extends SubmittablePage {
 	public get submitBtn(): ChainablePromiseElement {
-		return $( '#execute-button' );
+		return $( 'button#execute-button' );
 	}
 
 	public get resultTable(): ChainablePromiseElement {

From 3985c674286eecd656cadc58f910ca0948f713ab Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Thu, 14 Mar 2024 13:46:04 +0100
Subject: [PATCH 09/32] Revert

---
 test/helpers/pages/queryservice-ui/queryservice-ui.page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
index 78f712f86..8b17798c0 100644
--- a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
+++ b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
@@ -2,7 +2,7 @@ import SubmittablePage from '../submittable.page.js';
 
 class QueryServiceUIPage extends SubmittablePage {
 	public get submitBtn(): ChainablePromiseElement {
-		return $( 'button#execute-button' );
+		return $( '#execute-button' );
 	}
 
 	public get resultTable(): ChainablePromiseElement {

From 35b9ac3a1af67cb00d0cdfb9440da55e91541568 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Thu, 14 Mar 2024 13:49:33 +0100
Subject: [PATCH 10/32] Try UI

---
 test/specs/repo/queryservice.ts | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/test/specs/repo/queryservice.ts b/test/specs/repo/queryservice.ts
index f2a6d0d98..3d319a702 100644
--- a/test/specs/repo/queryservice.ts
+++ b/test/specs/repo/queryservice.ts
@@ -3,6 +3,7 @@ import LoginPage from 'wdio-mediawiki/LoginPage.js';
 import { getTestString } from 'wdio-mediawiki/Util.js';
 import WikibaseApi from 'wdio-wikibase/wikibase.api.js';
 import QueryServiceUIPage from '../../helpers/pages/queryservice-ui/queryservice-ui.page.js';
+import SpecialNewItemPage from '../../helpers/pages/special/new-item.page.js';
 import { wikibasePropertyString } from '../../helpers/wikibase-property-types.js';
 
 describe( 'QueryService', function () {
@@ -128,8 +129,21 @@ describe( 'QueryService', function () {
 	} );
 
 	it( 'Should not show up in queryservice ui after deletion', async function () {
-		// TODO make an item using the UI
-		const itemId = await WikibaseApi.createItem( getTestString( 'T267743-' ) );
+		await SpecialNewItemPage.open();
+
+		await $( 'input[name="label"]' ).setValue( getTestString( 'T267743-' ) );
+		await $( 'input[name="description"]' ).setValue( getTestString( 'Description' ) );
+		await $( 'input[name="aliases"]' ).setValue(
+			`${ getTestString( 'A' ) }|${ getTestString( 'B' ) }`
+		);
+		await SpecialNewItemPage.submit();
+
+		await expect( $( 'h1#firstHeading' ).$( 'span.wikibase-title-id' ) ).toHaveText(
+			/\(Q\d+\)/
+		);
+		const itemId = (
+			await $( 'h1#firstHeading' ).$( 'span.wikibase-title-id' ).getText()
+		).replace( /[()]/g, '' );
 
 		// Check it shows up after creation
 		await QueryServiceUIPage.open( `SELECT * WHERE{ wd:${ itemId } ?p ?o }` );

From 506e5f1e2821e132f6cc71aef0bc786a1bfc42f8 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Thu, 14 Mar 2024 14:57:37 +0100
Subject: [PATCH 11/32] Unrevert

---
 test/helpers/pages/queryservice-ui/queryservice-ui.page.ts | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
index 8b17798c0..78f712f86 100644
--- a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
+++ b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
@@ -2,7 +2,7 @@ import SubmittablePage from '../submittable.page.js';
 
 class QueryServiceUIPage extends SubmittablePage {
 	public get submitBtn(): ChainablePromiseElement {
-		return $( '#execute-button' );
+		return $( 'button#execute-button' );
 	}
 
 	public get resultTable(): ChainablePromiseElement {

From cf749e0d2070ecac4645dbef89ee7c8207363674 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Mon, 18 Mar 2024 14:24:45 +0100
Subject: [PATCH 12/32] Backwards

---
 test/specs/repo/extensions/wikibase-manifest.ts | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/test/specs/repo/extensions/wikibase-manifest.ts b/test/specs/repo/extensions/wikibase-manifest.ts
index 19bda931e..53ab839fd 100644
--- a/test/specs/repo/extensions/wikibase-manifest.ts
+++ b/test/specs/repo/extensions/wikibase-manifest.ts
@@ -9,13 +9,13 @@ describe( 'WikibaseManifest', function () {
 		);
 		const data = result.data;
 
-		expect( 'wikibase-docker' ).toBe( data.name );
+		expect( data.name ).toBe( 'wikibase-docker' );
 
-		expect( testEnv.vars.WIKIBASE_URL + '/w/api.php' ).toBe( data.api.action );
-		expect( testEnv.vars.WIKIBASE_URL + '/w/rest.php' ).toBe( data.api.rest );
+		expect( data.api.action ).toBe( testEnv.vars.WIKIBASE_URL + '/w/api.php' );
+		expect( data.api.rest ).toBe( testEnv.vars.WIKIBASE_URL + '/w/rest.php' );
 
-		expect(
+		expect( data.oauth.registration_page ).toBe(
 			testEnv.vars.WIKIBASE_URL + '/wiki/Special:OAuthConsumerRegistration'
-		).toBe( data.oauth.registration_page );
+		);
 	} );
 } );

From f90b8e282c6b5be1130ea97daa99a85746437ee9 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Mon, 18 Mar 2024 14:25:03 +0100
Subject: [PATCH 13/32] 18

---
 test/suites/upgrade/versions.ts | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/test/suites/upgrade/versions.ts b/test/suites/upgrade/versions.ts
index 00252f8a0..8531e0187 100644
--- a/test/suites/upgrade/versions.ts
+++ b/test/suites/upgrade/versions.ts
@@ -23,6 +23,9 @@ export const versions = {
 	WMDE16: 'wikibase/wikibase:1.40.2-wmde.16',
 	WMDE16_BUNDLE: 'wikibase/wikibase-bundle:1.40.2-wmde.16',
 
+	WMDE17: 'wikibase/wikibase:1.41.0-wmde.17',
+	WMDE17_BUNDLE: 'wikibase/wikibase-bundle:1.41.0-wmde.17',
+
 	LOCAL_BUILD: 'wikibase/wikibase',
 	LOCAL_BUILD_BUNDLE: 'wikibase/wikibase-bundle'
 };

From 398d30a46cae6e8825577b3662028afc526f8e18 Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Tue, 19 Mar 2024 16:06:57 +0000
Subject: [PATCH 14/32] fix: do not load EntitySchema in wikibase client test
 config

---
 test/suites/client-LocalSettings.php.template | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/test/suites/client-LocalSettings.php.template b/test/suites/client-LocalSettings.php.template
index 38fe9b543..2bb55a7b8 100644
--- a/test/suites/client-LocalSettings.php.template
+++ b/test/suites/client-LocalSettings.php.template
@@ -87,6 +87,10 @@ foreach (glob("LocalSettings.d/*.php") as ${DOLLAR}filename)
 		continue;
 	}
 
+	if (strpos(${DOLLAR}filename, 'EntitySchema') !== false) {
+		continue;
+	}
+
 	if (strpos(${DOLLAR}filename, 'Elastic') !== false) {
 		continue;
 	}

From 0ba87587566557c3199b91752070f716d6073acd Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Wed, 20 Mar 2024 10:08:29 +0000
Subject: [PATCH 15/32] fix: default port in wiki urls

---
 build/Wikibase/Dockerfile                       |  4 ++++
 ...fix-do-not-add-stdport-in-detectServer.patch | 17 +++++++++++++++++
 2 files changed, 21 insertions(+)
 create mode 100644 build/Wikibase/fix-do-not-add-stdport-in-detectServer.patch

diff --git a/build/Wikibase/Dockerfile b/build/Wikibase/Dockerfile
index a0816b15d..44e58bd2a 100644
--- a/build/Wikibase/Dockerfile
+++ b/build/Wikibase/Dockerfile
@@ -17,6 +17,10 @@ RUN git clone https://gerrit.wikimedia.org/r/mediawiki/extensions/Wikibase /tmp/
 FROM ${MEDIAWIKI_IMAGE_URL} as collector
 COPY --from=git-checkout /tmp/wikibase /var/www/html/extensions/Wikibase
 
+COPY ./fix-do-not-add-stdport-in-detectServer.patch /tmp/fix-do-not-add-stdport-in-detectServer.patch
+RUN cd /var/www/html/ && \
+    patch -Np1 < /tmp/fix-do-not-add-stdport-in-detectServer.patch
+
 # ###########################################################################
 # hadolint ignore=DL3006
 FROM ${COMPOSER_IMAGE_URL} as composer
diff --git a/build/Wikibase/fix-do-not-add-stdport-in-detectServer.patch b/build/Wikibase/fix-do-not-add-stdport-in-detectServer.patch
new file mode 100644
index 000000000..7f185b7d5
--- /dev/null
+++ b/build/Wikibase/fix-do-not-add-stdport-in-detectServer.patch
@@ -0,0 +1,17 @@
+diff --git a/includes/Request/WebRequest.php b/includes/Request/WebRequest.php
+index 734076449b8..78acae64100 100644
+--- a/includes/Request/WebRequest.php
++++ b/includes/Request/WebRequest.php
+@@ -288,10 +288,10 @@ class WebRequest {
+ 				$port = $stdPort;
+ 			} elseif ( $parts[1] === false ) {
+ 				if ( isset( $_SERVER['SERVER_PORT'] ) ) {
+-					$port = $_SERVER['SERVER_PORT'];
++					$port = (int)$_SERVER['SERVER_PORT'];
+ 				} // else leave it as $stdPort
+ 			} else {
+-				$port = $parts[1];
++				$port = (int)$parts[1];
+ 			}
+ 			break;
+ 		}

From d0e7df1e23819d96803af42d9641c4f60ef72b9d Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Wed, 20 Mar 2024 10:12:49 +0000
Subject: [PATCH 16/32] fix: lint

---
 build/Wikibase/Dockerfile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/build/Wikibase/Dockerfile b/build/Wikibase/Dockerfile
index 44e58bd2a..155ed2ebc 100644
--- a/build/Wikibase/Dockerfile
+++ b/build/Wikibase/Dockerfile
@@ -18,8 +18,8 @@ FROM ${MEDIAWIKI_IMAGE_URL} as collector
 COPY --from=git-checkout /tmp/wikibase /var/www/html/extensions/Wikibase
 
 COPY ./fix-do-not-add-stdport-in-detectServer.patch /tmp/fix-do-not-add-stdport-in-detectServer.patch
-RUN cd /var/www/html/ && \
-    patch -Np1 < /tmp/fix-do-not-add-stdport-in-detectServer.patch
+WORKDIR /var/www/html
+RUN patch -Np1 < /tmp/fix-do-not-add-stdport-in-detectServer.patch
 
 # ###########################################################################
 # hadolint ignore=DL3006

From 78adde9f88643a98594195f82e7eafa61f7211d7 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 13:45:34 +0100
Subject: [PATCH 17/32] Off chance

---
 variables.env | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/variables.env b/variables.env
index 142aabbe3..08134ab73 100644
--- a/variables.env
+++ b/variables.env
@@ -112,33 +112,33 @@ DEBIAN_IMAGE_URL=debian:bookworm-slim
 # Shouldn't require much of a review.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_41
-WIKIBASE_COMMIT=f0db2a7752920e7504b315f1340de08c28dd20d0
+WIKIBASE_COMMIT=c42002be38fa2756b8e475b38b1e6ab86d4f53ce
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_41
-BABEL_COMMIT=8dfd0eb9dd701be05b261f89372d2be17e055b04
+BABEL_COMMIT=e110eaa7293796ae3cf149177551997cc2009095
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_41
 CLDR_COMMIT=cad7768c4bd092318067fe15d674bf17ff965e2a
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_41
-CIRRUSSEARCH_COMMIT=3908adfa292be2066f53e7d7f8adbd9700130c9c
+CIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_41
-CONFIRMEDIT_COMMIT=4dbae6dfe9144368d336f4b91cc9cd3eeaa0fcfe
+CONFIRMEDIT_COMMIT=9fb5930d4485a72001016ad62e63e457addb91f2
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_41
 ELASTICA_COMMIT=24f94b80b51555e5e5b30b0633d215ee001650d4
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_41
 ENTITYSCHEMA_COMMIT=85ea615968509afab9214c572ac7aedc7dda4424
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_41
-NUKE_COMMIT=7c98e7c986ebe3cc031b5da2c6286e3326eaad2c
+NUKE_COMMIT=8e969d99c09faac3ec64b35ce5553e7ec8c87b28
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_41
-OAUTH_COMMIT=c74524cdb947cabd34b955b654ac00884d4ad4c0
+OAUTH_COMMIT=8cdf22304b8382ef0015da9ef3210f90eb7687ce
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_41
-SCRIBUNTO_COMMIT=d9df5c18b906158411fb92368235ee4a33442aa6
+SCRIBUNTO_COMMIT=825e1203b060850804885041dcd5d744f81a5df0
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_41
 SYNTAXHIGHLIGHT_GESHI_COMMIT=40908dd4204915eb20f1e43161c0489c7571f37d
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_41
-UNIVERSALLANGUAGESELECTOR_COMMIT=398865dd9c35baa1de1cd6a166d5bc6ad948467e
+UNIVERSALLANGUAGESELECTOR_COMMIT=47158fbee4ce6870133c29f1ed6affdb2eb31acc
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_41
-VISUALEDITOR_COMMIT=99d5ed141f1d3a0d0d1bf6416587fd7a1beccd8a
+VISUALEDITOR_COMMIT=753916e615161ee417bd5c6a37a19cbcffd49fb0
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_41
-WIKIBASECIRRUSSEARCH_COMMIT=7a4fdf2342eaecee9217e430d702c03c66dab55c
+WIKIBASECIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_41
 WIKIBASEMANIFEST_COMMIT=8c7cdae4d5a1e68b19fcca8eb5c2a7b6e3dc3e55
 
@@ -167,7 +167,7 @@ MAGNUSTOOLS_COMMIT=5b8cea412000072a2c8753023c11472a4ac11ef5
 # No versioning scheme. Review changes carefully.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/gui/+/refs/heads/master
-WDQSQUERYGUI_COMMIT=751e5dc0e4154e36d4413ad96bc3a01b950dfef7
+WDQSQUERYGUI_COMMIT=ff6d1c0413dc661d45ee16b6dbb624cd82cfc174
 
 
 # ##############################################################################

From bbcc085b1934d1f65941519de5cde6f8ba9d2d02 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 14:47:17 +0100
Subject: [PATCH 18/32] Revert

---
 variables.env | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/variables.env b/variables.env
index 08134ab73..142aabbe3 100644
--- a/variables.env
+++ b/variables.env
@@ -112,33 +112,33 @@ DEBIAN_IMAGE_URL=debian:bookworm-slim
 # Shouldn't require much of a review.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_41
-WIKIBASE_COMMIT=c42002be38fa2756b8e475b38b1e6ab86d4f53ce
+WIKIBASE_COMMIT=f0db2a7752920e7504b315f1340de08c28dd20d0
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_41
-BABEL_COMMIT=e110eaa7293796ae3cf149177551997cc2009095
+BABEL_COMMIT=8dfd0eb9dd701be05b261f89372d2be17e055b04
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_41
 CLDR_COMMIT=cad7768c4bd092318067fe15d674bf17ff965e2a
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_41
-CIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
+CIRRUSSEARCH_COMMIT=3908adfa292be2066f53e7d7f8adbd9700130c9c
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_41
-CONFIRMEDIT_COMMIT=9fb5930d4485a72001016ad62e63e457addb91f2
+CONFIRMEDIT_COMMIT=4dbae6dfe9144368d336f4b91cc9cd3eeaa0fcfe
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_41
 ELASTICA_COMMIT=24f94b80b51555e5e5b30b0633d215ee001650d4
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_41
 ENTITYSCHEMA_COMMIT=85ea615968509afab9214c572ac7aedc7dda4424
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_41
-NUKE_COMMIT=8e969d99c09faac3ec64b35ce5553e7ec8c87b28
+NUKE_COMMIT=7c98e7c986ebe3cc031b5da2c6286e3326eaad2c
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_41
-OAUTH_COMMIT=8cdf22304b8382ef0015da9ef3210f90eb7687ce
+OAUTH_COMMIT=c74524cdb947cabd34b955b654ac00884d4ad4c0
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_41
-SCRIBUNTO_COMMIT=825e1203b060850804885041dcd5d744f81a5df0
+SCRIBUNTO_COMMIT=d9df5c18b906158411fb92368235ee4a33442aa6
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_41
 SYNTAXHIGHLIGHT_GESHI_COMMIT=40908dd4204915eb20f1e43161c0489c7571f37d
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_41
-UNIVERSALLANGUAGESELECTOR_COMMIT=47158fbee4ce6870133c29f1ed6affdb2eb31acc
+UNIVERSALLANGUAGESELECTOR_COMMIT=398865dd9c35baa1de1cd6a166d5bc6ad948467e
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_41
-VISUALEDITOR_COMMIT=753916e615161ee417bd5c6a37a19cbcffd49fb0
+VISUALEDITOR_COMMIT=99d5ed141f1d3a0d0d1bf6416587fd7a1beccd8a
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_41
-WIKIBASECIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
+WIKIBASECIRRUSSEARCH_COMMIT=7a4fdf2342eaecee9217e430d702c03c66dab55c
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_41
 WIKIBASEMANIFEST_COMMIT=8c7cdae4d5a1e68b19fcca8eb5c2a7b6e3dc3e55
 
@@ -167,7 +167,7 @@ MAGNUSTOOLS_COMMIT=5b8cea412000072a2c8753023c11472a4ac11ef5
 # No versioning scheme. Review changes carefully.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/gui/+/refs/heads/master
-WDQSQUERYGUI_COMMIT=ff6d1c0413dc661d45ee16b6dbb624cd82cfc174
+WDQSQUERYGUI_COMMIT=751e5dc0e4154e36d4413ad96bc3a01b950dfef7
 
 
 # ##############################################################################

From 6c7b75c901580c043fa417cb2331c4b446c17a57 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 17:16:34 +0100
Subject: [PATCH 19/32] Fix

---
 .../repo/extensions/universal-language-selector.ts   | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index cc9530325..deb4c63a8 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -6,8 +6,16 @@ describe( 'UniversalLanguageSelector', function () {
 	it( 'Should be able to see the language selector menu', async function () {
 		await browser.url( testEnv.vars.WIKIBASE_URL );
 		await $( '#searchInput' ).click();
-		await $( '.imeselector' ).click();
 
-		await expect( $( '.imeselector-menu h3' ) ).toHaveText( 'English' );
+		// eslint-disable-next-line wdio/no-pause
+		await browser.pause( 1 * 1000 );
+
+		const selectors = await $$( 'div.imeselector' );
+		expect( selectors ).toHaveLength( 2 );
+		await selectors[ 1 ].click();
+
+		await expect(
+			$( 'div.imeselector-menu h3.ime-list-title' ).getHTML()
+		).resolves.toEqual( '<h3 class="ime-list-title autonym">English</h3>' );
 	} );
 } );

From b398568d75b7bab0772c93d884851e22fe2a4f77 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 17:23:04 +0100
Subject: [PATCH 20/32] Latest Previous 3

---
 .github/workflows/_build_test.yml | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/.github/workflows/_build_test.yml b/.github/workflows/_build_test.yml
index 8766633e7..def440af2 100644
--- a/.github/workflows/_build_test.yml
+++ b/.github/workflows/_build_test.yml
@@ -123,18 +123,15 @@ jobs:
       matrix:
         # TODO: can we get this from the environment to not have it hardcoded in the pipeline code?
         version: [
-            # Latest 1.37
-            "WMDE9",
-            "WMDE9_BUNDLE",
             # Latest 1.38
             "WMDE12",
             "WMDE12_BUNDLE",
             # Latest 1.39
             "WMDE15",
             "WMDE15_BUNDLE",
-            # Previous 1.40
-            "WMDE14",
-            "WMDE14_BUNDLE"
+            # Latest 1.40
+            "WMDE16",
+            "WMDE16_BUNDLE"
           ]
 
     steps:

From 3d74fab82961da54e0ab16c64c4938c21db25b9f Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 21:20:41 +0100
Subject: [PATCH 21/32] Um

---
 test/specs/repo/extensions/universal-language-selector.ts | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index deb4c63a8..9acf85038 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -11,8 +11,8 @@ describe( 'UniversalLanguageSelector', function () {
 		await browser.pause( 1 * 1000 );
 
 		const selectors = await $$( 'div.imeselector' );
-		expect( selectors ).toHaveLength( 2 );
-		await selectors[ 1 ].click();
+		expect( selectors.length ).toBeGreaterThan( 0 );
+		await selectors.pop().click();
 
 		await expect(
 			$( 'div.imeselector-menu h3.ime-list-title' ).getHTML()

From 63077508c4b8b5442cff32b00d1894d7c20703e2 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 22:12:57 +0100
Subject: [PATCH 22/32] Maybe

---
 test/specs/repo/extensions/universal-language-selector.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index 9acf85038..437228ead 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -4,6 +4,8 @@ describe( 'UniversalLanguageSelector', function () {
 	} );
 
 	it( 'Should be able to see the language selector menu', async function () {
+		this.retries( 4 );
+
 		await browser.url( testEnv.vars.WIKIBASE_URL );
 		await $( '#searchInput' ).click();
 
@@ -11,8 +13,8 @@ describe( 'UniversalLanguageSelector', function () {
 		await browser.pause( 1 * 1000 );
 
 		const selectors = await $$( 'div.imeselector' );
-		expect( selectors.length ).toBeGreaterThan( 0 );
-		await selectors.pop().click();
+		expect( selectors ).toHaveLength( 2 );
+		await selectors[ 1 ].click();
 
 		await expect(
 			$( 'div.imeselector-menu h3.ime-list-title' ).getHTML()

From 050731ee9fcfc5fc5b2ff9c775ade1e156b83c26 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 22:20:49 +0100
Subject: [PATCH 23/32] Pythonic

---
 test/specs/repo/extensions/universal-language-selector.ts | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index 437228ead..5d349eecd 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -4,17 +4,15 @@ describe( 'UniversalLanguageSelector', function () {
 	} );
 
 	it( 'Should be able to see the language selector menu', async function () {
-		this.retries( 4 );
-
 		await browser.url( testEnv.vars.WIKIBASE_URL );
 		await $( '#searchInput' ).click();
 
 		// eslint-disable-next-line wdio/no-pause
 		await browser.pause( 1 * 1000 );
 
-		const selectors = await $$( 'div.imeselector' );
-		expect( selectors ).toHaveLength( 2 );
-		await selectors[ 1 ].click();
+		await $$( 'div.imeselector' )
+			.filter( async ( selector ) => selector.isClickable() )[ 0 ]
+			.click();
 
 		await expect(
 			$( 'div.imeselector-menu h3.ime-list-title' ).getHTML()

From 59fc899b4605a94f6c3ca92a28f0d4faa973f185 Mon Sep 17 00:00:00 2001
From: Ricki Jay <ricki.jay@wikimedia.de>
Date: Wed, 20 Mar 2024 22:37:56 +0100
Subject: [PATCH 24/32] Retries

---
 test/specs/repo/extensions/universal-language-selector.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index 5d349eecd..5f012fade 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -4,6 +4,8 @@ describe( 'UniversalLanguageSelector', function () {
 	} );
 
 	it( 'Should be able to see the language selector menu', async function () {
+		this.retries( 3 );
+
 		await browser.url( testEnv.vars.WIKIBASE_URL );
 		await $( '#searchInput' ).click();
 

From 3a96ba450fa2037433e49ed6178cb9566bc59098 Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Thu, 21 Mar 2024 08:08:47 +0000
Subject: [PATCH 25/32] =?UTF-8?q?works=20on=20my=20machine=E2=84=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../repo/extensions/universal-language-selector.ts   | 12 +++++++-----
 1 file changed, 7 insertions(+), 5 deletions(-)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index 5f012fade..49adc3500 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -4,13 +4,15 @@ describe( 'UniversalLanguageSelector', function () {
 	} );
 
 	it( 'Should be able to see the language selector menu', async function () {
-		this.retries( 3 );
-
 		await browser.url( testEnv.vars.WIKIBASE_URL );
-		await $( '#searchInput' ).click();
 
-		// eslint-disable-next-line wdio/no-pause
-		await browser.pause( 1 * 1000 );
+		await $( '#searchform input' ).click();
+
+		// work around lang selector not showing up the first time
+		// blur the search bar
+		await $( '.page-Main_Page' ).click();
+		// focus search bar again, lang selector should be there now
+		await $( '#searchform input' ).click();
 
 		await $$( 'div.imeselector' )
 			.filter( async ( selector ) => selector.isClickable() )[ 0 ]

From 9f6a91ccbcbf807b19f2576b1ba64049bfb1ca22 Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Thu, 21 Mar 2024 09:42:06 +0000
Subject: [PATCH 26/32] fix: make check more robust, hopefully

---
 test/specs/repo/extensions/universal-language-selector.ts | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index 49adc3500..84ca666fe 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -14,12 +14,14 @@ describe( 'UniversalLanguageSelector', function () {
 		// focus search bar again, lang selector should be there now
 		await $( '#searchform input' ).click();
 
-		await $$( 'div.imeselector' )
+		await $$( '.imeselector' )
 			.filter( async ( selector ) => selector.isClickable() )[ 0 ]
 			.click();
 
+		// we need to use getHTML, getText() is the empty string for some reason,
+		// does it think the element is hidden?
 		await expect(
 			$( 'div.imeselector-menu h3.ime-list-title' ).getHTML()
-		).resolves.toEqual( '<h3 class="ime-list-title autonym">English</h3>' );
+		).resolves.toMatch( /English/ );
 	} );
 } );

From d5240940767029cdd87a34b9062ba68195e7d070 Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Thu, 21 Mar 2024 09:42:29 +0000
Subject: [PATCH 27/32] style: lint

---
 test/helpers/pages/queryservice-ui/queryservice-ui.page.ts | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
index 78f712f86..6caf0e071 100644
--- a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
+++ b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
@@ -2,7 +2,7 @@ import SubmittablePage from '../submittable.page.js';
 
 class QueryServiceUIPage extends SubmittablePage {
 	public get submitBtn(): ChainablePromiseElement {
-		return $( 'button#execute-button' );
+		return $( '#execute-button' );
 	}
 
 	public get resultTable(): ChainablePromiseElement {
@@ -14,7 +14,6 @@ class QueryServiceUIPage extends SubmittablePage {
 	 *
 	 * @param {string} query
 	 * @param {string[]} prefixes - Optional
-	 * @return {void}
 	 */
 	public async open( query: string, prefixes: string[] = [] ): Promise<void> {
 		await browser.url( testEnv.vars.WDQS_FRONTEND_URL );

From c0a5c9d08a6f6c7e11f124dd89cf7a0072a3e29d Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Thu, 21 Mar 2024 09:46:27 +0000
Subject: [PATCH 28/32] chore(hashes): bumped again, time flies like an arrow

---
 variables.env | 22 +++++++++++-----------
 1 file changed, 11 insertions(+), 11 deletions(-)

diff --git a/variables.env b/variables.env
index 142aabbe3..08134ab73 100644
--- a/variables.env
+++ b/variables.env
@@ -112,33 +112,33 @@ DEBIAN_IMAGE_URL=debian:bookworm-slim
 # Shouldn't require much of a review.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_41
-WIKIBASE_COMMIT=f0db2a7752920e7504b315f1340de08c28dd20d0
+WIKIBASE_COMMIT=c42002be38fa2756b8e475b38b1e6ab86d4f53ce
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_41
-BABEL_COMMIT=8dfd0eb9dd701be05b261f89372d2be17e055b04
+BABEL_COMMIT=e110eaa7293796ae3cf149177551997cc2009095
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_41
 CLDR_COMMIT=cad7768c4bd092318067fe15d674bf17ff965e2a
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_41
-CIRRUSSEARCH_COMMIT=3908adfa292be2066f53e7d7f8adbd9700130c9c
+CIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_41
-CONFIRMEDIT_COMMIT=4dbae6dfe9144368d336f4b91cc9cd3eeaa0fcfe
+CONFIRMEDIT_COMMIT=9fb5930d4485a72001016ad62e63e457addb91f2
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_41
 ELASTICA_COMMIT=24f94b80b51555e5e5b30b0633d215ee001650d4
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_41
 ENTITYSCHEMA_COMMIT=85ea615968509afab9214c572ac7aedc7dda4424
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_41
-NUKE_COMMIT=7c98e7c986ebe3cc031b5da2c6286e3326eaad2c
+NUKE_COMMIT=8e969d99c09faac3ec64b35ce5553e7ec8c87b28
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_41
-OAUTH_COMMIT=c74524cdb947cabd34b955b654ac00884d4ad4c0
+OAUTH_COMMIT=8cdf22304b8382ef0015da9ef3210f90eb7687ce
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_41
-SCRIBUNTO_COMMIT=d9df5c18b906158411fb92368235ee4a33442aa6
+SCRIBUNTO_COMMIT=825e1203b060850804885041dcd5d744f81a5df0
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_41
 SYNTAXHIGHLIGHT_GESHI_COMMIT=40908dd4204915eb20f1e43161c0489c7571f37d
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_41
-UNIVERSALLANGUAGESELECTOR_COMMIT=398865dd9c35baa1de1cd6a166d5bc6ad948467e
+UNIVERSALLANGUAGESELECTOR_COMMIT=47158fbee4ce6870133c29f1ed6affdb2eb31acc
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_41
-VISUALEDITOR_COMMIT=99d5ed141f1d3a0d0d1bf6416587fd7a1beccd8a
+VISUALEDITOR_COMMIT=753916e615161ee417bd5c6a37a19cbcffd49fb0
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_41
-WIKIBASECIRRUSSEARCH_COMMIT=7a4fdf2342eaecee9217e430d702c03c66dab55c
+WIKIBASECIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_41
 WIKIBASEMANIFEST_COMMIT=8c7cdae4d5a1e68b19fcca8eb5c2a7b6e3dc3e55
 
@@ -167,7 +167,7 @@ MAGNUSTOOLS_COMMIT=5b8cea412000072a2c8753023c11472a4ac11ef5
 # No versioning scheme. Review changes carefully.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/gui/+/refs/heads/master
-WDQSQUERYGUI_COMMIT=751e5dc0e4154e36d4413ad96bc3a01b950dfef7
+WDQSQUERYGUI_COMMIT=ff6d1c0413dc661d45ee16b6dbb624cd82cfc174
 
 
 # ##############################################################################

From 3cb8d28a853747346567d95102863681b8700e18 Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Thu, 21 Mar 2024 09:54:46 +0000
Subject: [PATCH 29/32] fix: weirdly broken commit hash of cirrus

---
 variables.env | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/variables.env b/variables.env
index 08134ab73..ab5d3ad6c 100644
--- a/variables.env
+++ b/variables.env
@@ -138,7 +138,7 @@ UNIVERSALLANGUAGESELECTOR_COMMIT=47158fbee4ce6870133c29f1ed6affdb2eb31acc
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_41
 VISUALEDITOR_COMMIT=753916e615161ee417bd5c6a37a19cbcffd49fb0
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_41
-WIKIBASECIRRUSSEARCH_COMMIT=f304f9a27ee1d99d9582fc222596e6c0e49d4ef9
+WIKIBASECIRRUSSEARCH_COMMIT=7a4fdf2342eaecee9217e430d702c03c66dab55c
 # https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_41
 WIKIBASEMANIFEST_COMMIT=8c7cdae4d5a1e68b19fcca8eb5c2a7b6e3dc3e55
 

From 98f4e48bc0b1c4f62cbb7f860e9a1c3de6f414d7 Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Mon, 25 Mar 2024 09:31:05 +0000
Subject: [PATCH 30/32] docs: note about getText and getHTML

---
 test/specs/repo/extensions/universal-language-selector.ts | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/test/specs/repo/extensions/universal-language-selector.ts b/test/specs/repo/extensions/universal-language-selector.ts
index 84ca666fe..40ee7b7ae 100644
--- a/test/specs/repo/extensions/universal-language-selector.ts
+++ b/test/specs/repo/extensions/universal-language-selector.ts
@@ -18,8 +18,9 @@ describe( 'UniversalLanguageSelector', function () {
 			.filter( async ( selector ) => selector.isClickable() )[ 0 ]
 			.click();
 
-		// we need to use getHTML, getText() is the empty string for some reason,
-		// does it think the element is hidden?
+		// We need to use getHTML(). If an element isn't interactable
+		// getText() returns an empty string.
+		// https://webdriver.io/docs/api/element/getText/
 		await expect(
 			$( 'div.imeselector-menu h3.ime-list-title' ).getHTML()
 		).resolves.toMatch( /English/ );

From 2fed2d459b4f6ff9ec557b5b59a61c97c35345c3 Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Mon, 25 Mar 2024 09:33:39 +0000
Subject: [PATCH 31/32] fix: linter warning

---
 test/helpers/pages/queryservice-ui/queryservice-ui.page.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
index 6caf0e071..8b17798c0 100644
--- a/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
+++ b/test/helpers/pages/queryservice-ui/queryservice-ui.page.ts
@@ -14,6 +14,7 @@ class QueryServiceUIPage extends SubmittablePage {
 	 *
 	 * @param {string} query
 	 * @param {string[]} prefixes - Optional
+	 * @return {void}
 	 */
 	public async open( query: string, prefixes: string[] = [] ): Promise<void> {
 		await browser.url( testEnv.vars.WDQS_FRONTEND_URL );

From 3768d60fbb017b859b54ed53ab97682a556c34ab Mon Sep 17 00:00:00 2001
From: Robert Timm <mail@rtti.de>
Date: Mon, 25 Mar 2024 09:35:31 +0000
Subject: [PATCH 32/32] docs: no fixed release date yet

---
 CHANGES.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGES.md b/CHANGES.md
index 6cc545b41..511b87b3d 100644
--- a/CHANGES.md
+++ b/CHANGES.md
@@ -10,7 +10,7 @@ This provides an overview of the releases that have been made using this release
 
 | Suite Version | Version Info | Date available | Release task  |
 |---------------|----------------------|----------------|------------| --------------|
-| wmde.17 ([spec](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.17/variables.env)) | MediaWiki (1.41.0, PHP 8.2.15, debian/apache 2.4.57-2), WDQS (0.3.137)    | 06 March 2024 | [T354644](https://phabricator.wikimedia.org/T354644) |
+| wmde.17 ([spec](https://github.com/wmde/wikibase-release-pipeline/blob/wmde.17/variables.env)) | MediaWiki (1.41.0, PHP 8.2.15, debian/apache 2.4.57-2), WDQS (0.3.137)    | XX March 2024 | [T354644](https://phabricator.wikimedia.org/T354644) |
 
 ## February 2024: Security releases for 1.40.2
 - [MediaWiki security and maintenance release announcement: 1.35.14 / 1.39.6 / 1.40.2](https://lists.wikimedia.org/hyperkitty/list/wikitech-l@lists.wikimedia.org/message/TDBUBCCOQJUT4SCHJNPHKQNPBUUETY52/)