jenkins-bot has submitted this change and it was merged.
Change subject: rename mw-install-sqlite-2 to mw-install-sqlite
......................................................................
rename mw-install-sqlite-2 to mw-install-sqlite
I have migrated all jobs so there is no need to keep the old inlined
shell. We are now using /srv/slave-scripts/bin/mw-install-sqlite.sh
No jobs changed.
Change-Id: I8da2bade98d827c8f5ee6e0764a6ca3e733516fd
---
M macro.yaml
M mediawiki.yaml
2 files changed, 5 insertions(+), 39 deletions(-)
Approvals:
Hashar: Looks good to me, approved
jenkins-bot: Verified
diff --git a/macro.yaml b/macro.yaml
index c9312cc..25bc33f 100644
--- a/macro.yaml
+++ b/macro.yaml
@@ -188,43 +188,9 @@
builders:
- shell: 'php "$WORKSPACE/maintenance/update.php" --quick'
-# DEPRECATED, should migrate everything to mw-install-sqlite-2
+# Shell script backed macro installing MediaWiki with a SQLite backend
- builder:
name: mw-install-sqlite
- builders:
- - shell: |
- #!/bin/bash -xe
- # Creating basic build directory tree
- mkdir -p api data charts coverage dist logs php-code-browser
- # Determine sqlite directory
- if [ -d "$HOME/tmpfs" ]
- then
- sqlitedir="$HOME/tmpfs/$JOB_NAME"
- mkdir -p $sqlitedir
- else
- sqlitedir="$WORKSPACE/data"
- fi
- # Ensure LocalSettings.php and my_wiki.sqlite don't exists
- rm -f LocalSettings.php
- rm -f "$sqlitedir/my_wiki.sqlite"
- # Run MediaWiki installer
- php maintenance/install.php \
- --confpath $WORKSPACE \
- --dbtype=sqlite \
- --dbname=my_wiki \
- --dbpath=$sqlitedir \
- --showexceptions=true \
- --pass testpass \
- sqlitetest \
- WikiAdmin
- # Installer will create sqlite db as 644 by jenkins:jenkins
- # Make writable for Apache (bug 47639)
- chmod +w "$sqlitedir/my_wiki.sqlite"
-
-# Shell script backed macro intended to migrate out of inlined shell produced
-# by the above macro mw-install-sqlite
-- builder:
- name: mw-install-sqlite-2
builders:
- shell: "/srv/slave-scripts/bin/mw-install-sqlite.sh"
@@ -233,7 +199,7 @@
builders:
- get-mw-core:
branch: '{mwbranch}'
- - mw-install-sqlite-2
+ - mw-install-sqlite
- mw-get-extensions:
dependencies: '{dependencies}'
- shell: |
diff --git a/mediawiki.yaml b/mediawiki.yaml
index d630c4e..bf5d255 100644
--- a/mediawiki.yaml
+++ b/mediawiki.yaml
@@ -27,7 +27,7 @@
- zuul
builders:
- - mw-install-sqlite-2
+ - mw-install-sqlite
- qunit
- job-template:
@@ -116,7 +116,7 @@
builders:
# FIXME no more supports "databasetype"
- - mw-install-sqlite-2
+ - mw-install-sqlite
- job-group:
name: mediawiki-jobs
@@ -174,7 +174,7 @@
- wipe-workspace
- get-mw-core:
branch: 'master'
- - mw-install-sqlite-2
+ - mw-install-sqlite
- shell: |
php tests/phpunit/phpunit.php \
--exclude-group Dump,Broken,ParserFuzz,Stub \
--
To view, visit https://gerrit.wikimedia.org/r/90121
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: I8da2bade98d827c8f5ee6e0764a6ca3e733516fd
Gerrit-PatchSet: 1
Gerrit-Project: integration/jenkins-job-builder-config
Gerrit-Branch: master
Gerrit-Owner: Hashar <[email protected]>
Gerrit-Reviewer: Hashar <[email protected]>
Gerrit-Reviewer: jenkins-bot
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
