T368255: release 1.0.0 (WBS Deploy 1.0.0)

CHANGES.md

@@ -4,6 +4,30 @@ This file is intended for use by the developers of this repository and of the re
 
 ## July 2024
 
+### Wikibase Release Pipeline 1.0.0
+
+#### WBS Images
+
+| Image               | WBS Version | Upstream Version     | Base Image                    | Distribution    |
+| ------------------- | ----------- | -------------------- | ----------------------------- | --------------- |
+| WBS Wikibase        | 1.0.0       | MediaWiki 1.39.8     | PHP 8.3.8 apache              | Debian Bookworm |
+| WBS WDQS            | 1.0.0       | WDQS 0.3.142         | JRE Eclipse Temurin 8u412-b08 | Debian Bookworm |
+| WBS WDQS Frontend   | 1.0.0       | N/A                  | Nginx 1.27.0                  | Debian Bookworm |
+| WBS WDQS Proxy      | 1.0.0       | N/A                  | Nginx 1.27.0                  | Debian Bookworm |
+| WBS QuickStatements | 1.0.0       | N/A                  | PHP 8.3.8 Apache              | Debian Bookworm |
+| WBS ElasticSearch   | 1.0.0       | ElasticSearch 7.10.2 | N/A                           | N/A             |
+
+#### WBS Deploy 1.0.0
+
+https://phabricator.wikimedia.org/T368255
+
+On top of the images above, WBS Deploy uses:
+
+| Image               | Upstream Version     |
+| ------------------- | -------------------- |
+| MariaDB             | 10.11                |
+| Traefik             | 3.1                  |
+
 ### Wikibase Release Pipeline 3.0.0
 
 #### WBS Images

deploy/docker-compose.yml

@@ -6,7 +6,7 @@ services:
   # --------------------------------------------------
 
   wikibase:
-    image: wikibase/wikibase:3
+    image: wikibase/wikibase:1
     depends_on:
       mysql:
         condition: service_healthy
@@ -39,12 +39,12 @@ services:
       start_period: 5m
 
   wikibase-jobrunner:
-    image: wikibase/wikibase:3
+    image: wikibase/wikibase:1
     command: /jobrunner-entrypoint.sh
     depends_on:
       wikibase:
         condition: service_healthy
-    restart: always
+    restart: unless-stopped
     volumes_from:
       - wikibase
 

test/package.json

@@ -28,6 +28,7 @@
 		"npm-run-all": "^4.1.5",
 		"prettier": "^3.2.5",
 		"prettier-plugin-organize-imports": "^3.2.4",
+		"semver-parser": "^4.1.6",
 		"stylelint-config-wikimedia": "0.16.1",
 		"ts-node": "^10.9.2",
 		"tslib": "^2.6.2",

test/specs/repo/extensions/universal-language-selector.ts

@@ -1,3 +1,4 @@
+import { parseSemVer } from 'semver-parser';
 import page from '../../../helpers/pages/page.js';
 
 describe( 'UniversalLanguageSelector', function () {
@@ -8,23 +9,30 @@ describe( 'UniversalLanguageSelector', function () {
 	it( 'Should be able to see the language selector menu', async function () {
 		await page.open( '' );
 
-		await $( '#searchform input' ).click();
+		// MediaWiki 1.39 default skin sets up language selector differently than subsequent versions,
+		// this exception can be removed once MW 1.39 is no longer supported.
+		if ( parseSemVer( testEnv.vars.MEDIAWIKI_VERSION ).minor === 39 ) {
+			await $( '#searchInput' ).click();
+			await $( '.imeselector' ).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 expect( $( '.imeselector-menu h3' ) ).toHaveText( 'English' );
+		} else {
+			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 $$( '.imeselector' )
+				.filter( async ( selector ) => selector.isClickable() )[ 0 ]
+				.click();
 
-		await $$( '.imeselector' )
-			.filter( async ( selector ) => selector.isClickable() )[ 0 ]
-			.click();
-
-		// 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/ );
+			// 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/ );
+		}
 	} );
 } );

test/specs/repo/property.ts

@@ -1,3 +1,4 @@
+import { parseSemVer } from 'semver-parser';
 import WikibaseApi from 'wdio-wikibase/wikibase.api.js';
 import PropertyPage from '../../helpers/pages/entity/property.page.js';
 import page from '../../helpers/pages/page.js';
@@ -89,7 +90,9 @@ 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();
+				if ( parseSemVer( testEnv.vars.MEDIAWIKI_VERSION ).minor > 39 ) {
+					await $( '.vector-main-menu-dropdown' ).click();
+				}
 				await $( '=Recent changes' ).click();
 				await expect( $( `=(${ propertyId })` ) ).toExist();
 				await expect( $( `=(${ stringPropertyId })` ) ).toExist();
@@ -121,7 +124,12 @@ describe( 'Property', function () {
 				await page.open( '/wiki/Special:SetLabelDescriptionAliases/' );
 				await $( 'label=ID:' ).click();
 				await browser.keys( propertyId.split( '' ) );
-				await $( 'span=Continue' ).click();
+
+				if ( parseSemVer( testEnv.vars.MEDIAWIKI_VERSION ).minor === 39 ) {
+					await $( 'span=Set label, description and aliases' ).click();
+				} else {
+					await $( 'span=Continue' ).click();
+				}
 
 				await $( 'label=Label:' ).click();
 				await browser.keys( `${ dataType.name } Label`.split( '' ) );
@@ -132,7 +140,11 @@ describe( 'Property', function () {
 					`${ dataType.name } Alias A|${ dataType.name } Alias B`.split( '' )
 				);
 
-				await $( 'span=Save changes' ).click();
+				if ( parseSemVer( testEnv.vars.MEDIAWIKI_VERSION ).minor === 39 ) {
+					await $( 'span=Set label, description and aliases' ).click();
+				} else {
+					await $( 'span=Save changes' ).click();
+				}
 
 				await expect(
 					$( `span.wikibase-labelview-text=${ dataType.name } Label` )

variables.env

@@ -4,14 +4,14 @@
 # Version
 # ##############################################################################
 # Version of the repository.
-VERSION=3.0.0
+VERSION=1.0.0
 
 
 # ##############################################################################
 # Deploy version
 # ##############################################################################
 # The version of the deploy directory.
-WBS_DEPLOY_VERSION=3.0.0
+WBS_DEPLOY_VERSION=1.0.0
 
 
 # ##############################################################################
@@ -20,8 +20,8 @@ WBS_DEPLOY_VERSION=3.0.0
 # Update only patch versions for security releases.
 # Choose latest version for major releases.
 # https://releases.wikimedia.org/mediawiki/
-WBS_WIKIBASE_VERSION=3.0.0
-MEDIAWIKI_VERSION=1.42.1
+WBS_WIKIBASE_VERSION=1.0.0
+MEDIAWIKI_VERSION=1.39.8
 
 
 # ##############################################################################
@@ -135,36 +135,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_42
-WIKIBASE_COMMIT=1255c6e3ce8c14b72f0fa49ad98ba5fb388fbc0c
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_42
-BABEL_COMMIT=d67b57379ae9d4ebb68ae764a6f9d05c8bf6c87d
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_42
-CLDR_COMMIT=6c28f1b99f9a7ea0eb7e11f48102805fd11a337d
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_42
-CIRRUSSEARCH_COMMIT=9cfe80151727a6950d278238f54db31aee889dd0
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_42
-CONFIRMEDIT_COMMIT=48757725a81a500c5121517ea7c72c6926279718
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_42
-ELASTICA_COMMIT=382af148ab67640ca2ce213df245a1617487db68
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_42
-ENTITYSCHEMA_COMMIT=7e66b541c9c0dec2caf316c9525334fbbf397ec5
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_42
-NUKE_COMMIT=54a2121e0855e445c32f3b9630e4410e53536bf6
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_42
-OAUTH_COMMIT=fccfb680cc4bc9eae094f0356967e1b77faa88c9
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_42
-SCRIBUNTO_COMMIT=f1d1e8adaac228e916cb6b7f6d6425037c928d64
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_42
-SYNTAXHIGHLIGHT_GESHI_COMMIT=e4fabbb7b4665e6066e931c5c48f39e0774c803a
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_42
-UNIVERSALLANGUAGESELECTOR_COMMIT=752ea5965b7b93f4e14fa861d587b0966b15413d
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_42
-VISUALEDITOR_COMMIT=5c2c9b3a175daa5c6697d1241409311739d7a302
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_42
-WIKIBASECIRRUSSEARCH_COMMIT=0d8f5907ea9f4274e28ea2707440b176b2d8c071
-# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_42
-WIKIBASEMANIFEST_COMMIT=5413c72af830a031fbf485b9c6b9e49057ac88c3
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Wikibase/+/refs/heads/REL1_39
+WIKIBASE_COMMIT=2cc3b53a186eebdb08696eed805ac969c634cf17
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Babel/+/refs/heads/REL1_39
+BABEL_COMMIT=b39dbd5e09485a991e44e8ed84ebc593c5fc9446
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/cldr/+/refs/heads/REL1_39
+CLDR_COMMIT=e091a216e2239e8572c563c1970dfec50c474da2
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/CirrusSearch/+/refs/heads/REL1_39
+CIRRUSSEARCH_COMMIT=3ef5274b13f84cf7090f09107e2f243bdc0feeac
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/ConfirmEdit/+/refs/heads/REL1_39
+CONFIRMEDIT_COMMIT=0073a9c88b82bef92388ffb97ae53697fd44fdd4
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Elastica/+/refs/heads/REL1_39
+ELASTICA_COMMIT=ab0fa8b6cc74c4258633e2c97a07b8c975f8f0a9
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/EntitySchema/+/refs/heads/REL1_39
+ENTITYSCHEMA_COMMIT=41a33e63bd1d353b23f6488f391c6071beb60a86
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Nuke/+/refs/heads/REL1_39
+NUKE_COMMIT=b0ced2d46d1f6c910a0492e3d7c9168fae23c5a7
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/OAuth/+/refs/heads/REL1_39
+OAUTH_COMMIT=f3ed0facbca6055f0b5f3a266bdac2b8625350fd
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/Scribunto/+/refs/heads/REL1_39
+SCRIBUNTO_COMMIT=e8ded13bdb3e693300f27672cb31415f244107c6
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/SyntaxHighlight_GeSHi/+/refs/heads/REL1_39
+SYNTAXHIGHLIGHT_GESHI_COMMIT=9df9789fbcd1d06713b5452c6615da0c5340443c
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/UniversalLanguageSelector/+/refs/heads/REL1_39
+UNIVERSALLANGUAGESELECTOR_COMMIT=8382bea4356da1b6f93ec0f4bd406e5768347ec3
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/VisualEditor/+/refs/heads/REL1_39
+VISUALEDITOR_COMMIT=081a3f5fca09b76dcd856b37f2de7cfec9e4cec0
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseCirrusSearch/+/refs/heads/REL1_39
+WIKIBASECIRRUSSEARCH_COMMIT=392d92af64c014fcdfe672968270d0c22d352b67
+# https://gerrit.wikimedia.org/r/plugins/gitiles/mediawiki/extensions/WikibaseManifest/+/refs/heads/REL1_39
+WIKIBASEMANIFEST_COMMIT=a9acda8d9f3e671e30fdf14c00570d1b06a763ab
 
 
 # ##############################################################################
@@ -177,7 +177,7 @@ WIKIBASEMANIFEST_COMMIT=5413c72af830a031fbf485b9c6b9e49057ac88c3
 # https://github.com/ProfessionalWiki/WikibaseLocalMedia/commits/master
 WIKIBASELOCALMEDIA_COMMIT=b2aac56b81c25cd04708f1019a833c81f074a1f2
 # https://github.com/ProfessionalWiki/WikibaseEdtf/commits/master
-WIKIBASEEDTF_COMMIT=6e8ebf2818de4dd43a3f39d290e46a1626db1b22
+WIKIBASEEDTF_COMMIT=5d5d59da21c50d12d1a3371c766480ff4126b7b4
 # https://github.com/magnusmanske/quickstatements/commits/master
 QUICKSTATEMENTS_COMMIT=c4b2c6b086b319aa32dcdd7a323edf188faaa66d
 # https://bitbucket.org/magnusmanske/magnustools/commits/branch/master
@@ -192,7 +192,7 @@ WBS_QUICKSTATEMENTS_VERSION=1.0.0
 # No versioning scheme. Review changes carefully.
 #
 # https://gerrit.wikimedia.org/r/plugins/gitiles/wikidata/query/gui/+/refs/heads/master
-WDQSQUERYGUI_COMMIT=b8fe9f1dbba7677f19d23b888e001e7c20978075
+WDQSQUERYGUI_COMMIT=7638030f312c21cc5a4fccd05e16d6ffffdd9220
 
 
 # ##############################################################################