Addshore has uploaded a new change for review. (
https://gerrit.wikimedia.org/r/394291 )
Change subject: DNM Remove wikidatabuilder
......................................................................
DNM Remove wikidatabuilder
This must wait for the labs project using this to
first be killed
Bug: T181706
Change-Id: I207400d92e46434b55003808b686e44efa183482
---
D modules/role/manifests/wikidata/builder.pp
D modules/wikidatabuilder/files/cron-build.sh
D modules/wikidatabuilder/files/ssh-client-config
D modules/wikidatabuilder/files/ssh-client-known_hosts
D modules/wikidatabuilder/manifests/init.pp
5 files changed, 0 insertions(+), 222 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/operations/puppet
refs/changes/91/394291/1
diff --git a/modules/role/manifests/wikidata/builder.pp
b/modules/role/manifests/wikidata/builder.pp
deleted file mode 100644
index a8cc1e5..0000000
--- a/modules/role/manifests/wikidata/builder.pp
+++ /dev/null
@@ -1,5 +0,0 @@
-# filtertags: labs-project-wikidata-build
-class role::wikidata::builder {
- include ::wikidatabuilder
-}
-
diff --git a/modules/wikidatabuilder/files/cron-build.sh
b/modules/wikidatabuilder/files/cron-build.sh
deleted file mode 100644
index 1400839..0000000
--- a/modules/wikidatabuilder/files/cron-build.sh
+++ /dev/null
@@ -1,70 +0,0 @@
-#!/usr/bin/env bash
-# License AGPL version 3 or later
-# Authors: Addshore, JanZerebecki
-set -ex
-
-export
PATH="/data/wdbuilder/composer/vendor/bin/:/usr/local/bin:/usr/bin:/bin:"
-
-# Get the date at the start of the script for use in the commit msg
-now="$(date -Is)"
-
-echo --1-- Rebuilding Wikidata Build
-
-# Make sure the WikidataBuilder is up to date
-cd /data/wdbuilder/buildresources
-git checkout master
-git fetch origin master
-git reset --hard origin/master
-# Rebuild Wikidata
-./node_modules/.bin/grunt install
-
-# Only continue if the build returned "0" success
-build_exit_value=$?
-if [ "${build_exit_value}" -eq "0" ] ; then
-
- echo --2-- Pulling current Wikidata Repo
-
- # Checkout the current master of Wikidata!
- # If we dont do this our .git will be wrong and things get messy
- cd /data/wdbuilder/wikidata
- git checkout master
- git fetch origin master
- git reset --hard origin/master
-
- echo --3-- Copying the new Wikidata build to the Repo
-
- # Make a temporary folder for our new build
- mkdir /data/wdbuilder/wikidata-tmp
- # Copy the .git from the Wikidata repo over to our tmp folder
- cp --recursive --no-dereference --preserve=mode,links
/data/wdbuilder/wikidata/.git /data/wdbuilder/wikidata-tmp/
- # Force remove everything from the git index
- cd /data/wdbuilder/wikidata-tmp
- git rm --quiet -rf *
- # Copy all files created from the build into our new folder
- cd /data/wdbuilder/buildresources
- GLOBIGNORE=.:..:.git
- cp -r * .* /data/wdbuilder/wikidata-tmp/
- unset GLOBIGNORE
- # Remove the old Wikidata folder and copy our new one over
- rm -rf /data/wdbuilder/wikidata
- mv /data/wdbuilder/wikidata-tmp /data/wdbuilder/wikidata
-
- echo --4-- Committing new Wikidata build
-
- # Add all files to the commit and commit to gerrit!
- cd /data/wdbuilder/wikidata
- # remove .git directories so as not to use submodules instead of a deep
copy
- find -mindepth 2 -iname '.git' -exec 'rm' '-rf' '{}' '+'
- git add .
- git add --force composer.lock
- git checkout HEAD -- .gitreview
- git commit -m "New Wikidata Build - $now"
- git push origin HEAD:refs/publish/master
- git reset --hard origin/master
-
-else
-
- # TODO retry after a certain ammount of time?
- echo "Build exited with a bad error code...."
-
-fi
diff --git a/modules/wikidatabuilder/files/ssh-client-config
b/modules/wikidatabuilder/files/ssh-client-config
deleted file mode 100644
index 2cc8096..0000000
--- a/modules/wikidatabuilder/files/ssh-client-config
+++ /dev/null
@@ -1 +0,0 @@
-IdentityFile ~/.ssh/id_rsa
diff --git a/modules/wikidatabuilder/files/ssh-client-known_hosts
b/modules/wikidatabuilder/files/ssh-client-known_hosts
deleted file mode 100644
index ab237ba..0000000
--- a/modules/wikidatabuilder/files/ssh-client-known_hosts
+++ /dev/null
@@ -1,2 +0,0 @@
-github.com,204.232.175.90 ssh-rsa
AAAAB3NzaC1yc2EAAAABIwAAAQEAq2A7hRGmdnm9tUDbO9IDSwBK6TbQa+PXYPCPy6rbTrTtw7PHkccKrpp0yVhp5HdEIcKr6pLlVDBfOLX9QUsyCOV0wzfjIJNlGEYsdlLJizHhbn2mUjvSAHQqZETYP81eFzLQNnPHt4EVVUh7VfDESU84KezmD5QlWpXLmvU31/yMf+Se8xhHTvKSCZIFImWwoG6mbUoWf9nzpIoaSjB+weqqUUmpaaasXVal72J+UX2B+2RPW3RcT0eOzQgqlJL3RKrTJvdsjE3JEAvGq3lGHSZXy28G3skua2SmVi/w4yCE6gbODqnTWlg7+wC604ydGXA8VJiS5ap43JXiUFFAaQ==
-[gerrit.wikimedia.org]:29418,[208.80.154.81]:29418 ssh-rsa
AAAAB3NzaC1yc2EAAAADAQABAAAAgQCF8pwFLehzCXhbF1jfHWtd9d1LFq2NirplEBQYs7AOrGwQ/6ZZI0gvZFYiEiaw1o+F1CMfoHdny1VfWOJF3mJ1y9QMKAacc8/Z3tG39jBKRQCuxmYLO1SWymv7/Uvx9WQlkNRoTdTTa9OJFy6UqvLQEXKYaokfMIUHZ+oVFf1CgQ==
diff --git a/modules/wikidatabuilder/manifests/init.pp
b/modules/wikidatabuilder/manifests/init.pp
deleted file mode 100644
index f6adb03..0000000
--- a/modules/wikidatabuilder/manifests/init.pp
+++ /dev/null
@@ -1,144 +0,0 @@
-# licence AGPL version 3 or later
-class wikidatabuilder {
-
- requires_realm('labs')
-
- require_package(
- 'nodejs',
- 'npm',
- 'php5',
- 'php5-cli',
- )
-
- group { 'wdbuilder':
- ensure => present,
- }
-
- user { 'wdbuilder':
- ensure => 'present',
- home => '/data/wdbuilder',
- shell => '/bin/bash',
- managehome => true,
- system => true,
- }
-
- git::clone { 'wdbuilder composer':
- ensure => 'latest',
- directory => '/data/wdbuilder/composer',
- origin =>
'https://gerrit.wikimedia.org/r/p/integration/composer.git',
- owner => 'wdbuilder',
- group => 'wdbuilder',
- recurse_submodules => true,
- }
-
- exec { 'ssh-keygen-/data/wdbuilder/.ssh/id_rsa':
- user => 'wdbuilder',
- command => "/usr/bin/ssh-keygen -t rsa -b 4096 -C 'wikidatabuilder on
${::fqdn} ${::projectgroup}' -f /data/wdbuilder/.ssh/id_rsa",
- require => User['wdbuilder'],
- creates => '/data/wdbuilder/.ssh/id_rsa',
- }
-
- file { '/data/wdbuilder/.ssh/known_hosts':
- ensure => file,
- mode => '0755',
- owner => 'wdbuilder',
- group => 'wdbuilder',
- source => 'puppet:///modules/wikidatabuilder/ssh-client-known_hosts',
- require => Exec['ssh-keygen-/data/wdbuilder/.ssh/id_rsa'],
- }
-
- file { '/data/wdbuilder/.ssh/config':
- ensure => file,
- mode => '0755',
- owner => 'wdbuilder',
- group => 'wdbuilder',
- source => 'puppet:///modules/wikidatabuilder/ssh-client-config',
- require => Exec['ssh-keygen-/data/wdbuilder/.ssh/id_rsa'],
- }
-
- git::clone { 'wikidata':
- ensure => 'latest',
- directory => '/data/wdbuilder/wikidata',
- origin =>
'ssh://[email protected]:29418/mediawiki/extensions/Wikidata',
- owner => 'wdbuilder',
- group => 'wdbuilder',
- require => File['/data/wdbuilder/.ssh/config'],
- }
-
- exec { 'exec-/data/wdbuilder/wikidata/.git/hooks/commit-msg':
- user => 'wdbuilder',
- command => '/usr/bin/scp -p -P 29418
[email protected]:hooks/commit-msg
/data/wdbuilder/wikidata/.git/hooks/commit-msg',
- creates => '/data/wdbuilder/wikidata/.git/hooks/commit-msg',
- require => [
- Git::Clone['wikidata'],
- File['/data/wdbuilder/.ssh/config'],
- ],
- }
-
- file { '/data/wdbuilder/wikidata/.git/hooks/commit-msg':
- mode => '0755',
- owner => 'wdbuilder',
- group => 'wdbuilder',
- require => Exec['exec-/data/wdbuilder/wikidata/.git/hooks/commit-msg'],
- }
-
- git::clone { 'wikidatabuildresources':
- ensure => latest,
- directory => '/data/wdbuilder/buildresources',
- origin => 'https://gerrit.wikimedia.org/r/wikidata/build-resources',
- owner => 'wdbuilder',
- group => 'wdbuilder',
- require => [
- File['/data/wdbuilder/.ssh/config'],
- File['/data/wdbuilder/.ssh/known_hosts'],
- ],
- }
-
- git::userconfig{ 'gitconf for wdbuilder user':
- homedir => '/data/wdbuilder',
- settings => {
- 'user' => {
- 'name' => 'WikidataBuilder',
- 'email' => '[email protected]',
- },
- },
- require => User['wdbuilder'],
- }
-
- # sadly npm has no way of telling it the name of the nodejs binary and
upstream refuses to fix that https://github.com/joyent/node/issues/3911
- $fixnodejs = shellquote('sed', '-i', 's|^#!/usr/bin/env
node$|#!/usr/bin/env nodejs|')
- exec { 'npm_install-/data/wdbuilder/buildresources':
- user => 'wdbuilder',
- cwd => '/data/wdbuilder/buildresources',
- command => "/usr/bin/npm install && ${fixnodejs}
/data/wdbuilder/buildresources/node_modules/grunt-cli/bin/grunt",
- creates => '/data/wdbuilder/buildresources/node_modules',
- require => [
- Package['npm'],
- Git::Clone['wikidatabuildresources']
- ],
- }
-
- file { '/data/wdbuilder/cron-build.sh':
- ensure => file,
- mode => '0755',
- owner => 'wdbuilder',
- group => 'wdbuilder',
- source => 'puppet:///modules/wikidatabuilder/cron-build.sh',
- }
-
- cron { 'builder_cron':
- ensure => present,
- command => '/data/wdbuilder/cron-build.sh > /data/wdbuilder/cron.log
2>&1',
- user => 'wdbuilder',
- hour => '10',
- minute => '0',
- require => [
- File['/data/wdbuilder/cron-build.sh'],
- File['/data/wdbuilder/wikidata/.git/hooks/commit-msg'],
- Exec['npm_install-/data/wdbuilder/buildresources'],
- Git::Userconfig['gitconf for wdbuilder user'],
- Git::Clone['wdbuilder composer'],
- ],
- }
-
-}
--
To view, visit https://gerrit.wikimedia.org/r/394291
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: newchange
Gerrit-Change-Id: I207400d92e46434b55003808b686e44efa183482
Gerrit-PatchSet: 1
Gerrit-Project: operations/puppet
Gerrit-Branch: production
Gerrit-Owner: Addshore <[email protected]>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
