Page MenuHomePhabricator
Paste P13599

(An Untitled Masterwork)
ActivePublic
Actions

Authored by RLazarus on Dec 18 2020, 12:01 AM.
Tags
None
Referenced Files
F33949355: raw-paste-data.txt
Dec 18 2020, 12:01 AM
Subscribers
None
rzl@puppetmaster1001:~$ sudo puppet-merge
Fetching new commits from: https://gerrit.wikimedia.org/r/labs/private
failed to run `git fetch`
Command '['git', 'fetch']' returned non-zero exit status 128.
Fetching new commits from: https://gerrit.wikimedia.org/r/operations/puppet
diff --git a/hieradata/role/common/releases.yaml b/hieradata/role/common/releases.yaml
index e5f455ba11..f9edcf22c5 100644
--- a/hieradata/role/common/releases.yaml
+++ b/hieradata/role/common/releases.yaml
@@ -1,6 +1,7 @@
profile::standard::admin_groups:
- releasers-blubber
- releasers-mediawiki
+ - releasers-mwcli
- releasers-mobile
- releasers-parsoid
- releasers-wikibase
diff --git a/modules/admin/data/data.yaml b/modules/admin/data/data.yaml
index 634252f841..d25fa5fb4d 100644
--- a/modules/admin/data/data.yaml
+++ b/modules/admin/data/data.yaml
@@ -153,6 +153,10 @@ groups:
gid: 808
description: people who upload blubber releases
members: [dduvall, jhuneidi, liw, thcipriani]
+ releasers-mwcli:
+ gid: 822
+ description: people who upload mw-cli releases (T250241)
+ members: [jhuneidi, brennen]
cloudelastic-roots:
gid: 809
description: manage cloudelastic nodes
diff --git a/modules/profile/manifests/releases/mwcli.pp b/modules/profile/manifests/releases/mwcli.pp
new file mode 100644
index 0000000000..e6ec613e65
--- /dev/null
+++ b/modules/profile/manifests/releases/mwcli.pp
@@ -0,0 +1,9 @@
+# https://releases.wikimedia.org/mwcli
+class profile::releases::mwcli {
+ file { '/srv/org/wikimedia/releases/mwcli':
+ ensure => 'directory',
+ owner => 'root',
+ group => 'releasers-mwcli',
+ mode => '2775',
+ }
+}
diff --git a/modules/role/manifests/releases.pp b/modules/role/manifests/releases.pp
index 234097e4cb..c3ec0c4cd6 100644
--- a/modules/role/manifests/releases.pp
+++ b/modules/role/manifests/releases.pp
@@ -14,6 +14,7 @@ class role::releases {
include ::profile::releases::common
include ::profile::releases::mediawiki
include ::profile::releases::mediawiki::security
+ include ::profile::releases::mwcli
include ::profile::releases::reprepro
include ::profile::releases::parsoid
include ::profile::releases::blubber
RLazarus: Add mw-cli to the releases server (bfbb63cf1f)
Merge these changes? (yes/no)? y
HEAD is currently 8eac157e2d8f495cb67a5b4044d0082417b33638
Updating 8eac157e2d..bfbb63cf1f
Fast-forward
hieradata/role/common/releases.yaml | 1 +
modules/admin/data/data.yaml | 4 ++++
modules/profile/manifests/releases/mwcli.pp | 9 +++++++++
modules/role/manifests/releases.pp | 1 +
4 files changed, 15 insertions(+)
create mode 100644 modules/profile/manifests/releases/mwcli.pp
Running git clean to clean any untracked files.
All done! HEAD is now bfbb63cf1fec39c02eaec33e474816d6ef8731aa
Problems merging LABS
===> Starting run on puppetmaster1002.eqiad.wmnet...
Fetching new commits from: https://gerrit.wikimedia.org/r/operations/puppet
HEAD is currently 8eac157e2d8f495cb67a5b4044d0082417b33638
Updating 8eac157e2d..bfbb63cf1f
Fast-forward
hieradata/role/common/releases.yaml | 1 +
modules/admin/data/data.yaml | 4 ++++
modules/profile/manifests/releases/mwcli.pp | 9 +++++++++
modules/role/manifests/releases.pp | 1 +
4 files changed, 15 insertions(+)
create mode 100644 modules/profile/manifests/releases/mwcli.pp
Running git clean to clean any untracked files.
All done! HEAD is now bfbb63cf1fec39c02eaec33e474816d6ef8731aa
Connection to puppetmaster1002.eqiad.wmnet closed.
OK: puppet-merge on puppetmaster1002.eqiad.wmnet (ops) succeeded
===> Starting run on puppetmaster1003.eqiad.wmnet...
Fetching new commits from: https://gerrit.wikimedia.org/r/operations/puppet
HEAD is currently 8eac157e2d8f495cb67a5b4044d0082417b33638
Updating 8eac157e2d..bfbb63cf1f
Fast-forward
hieradata/role/common/releases.yaml | 1 +
modules/admin/data/data.yaml | 4 ++++
modules/profile/manifests/releases/mwcli.pp | 9 +++++++++
modules/role/manifests/releases.pp | 1 +
4 files changed, 15 insertions(+)
create mode 100644 modules/profile/manifests/releases/mwcli.pp
Running git clean to clean any untracked files.
All done! HEAD is now bfbb63cf1fec39c02eaec33e474816d6ef8731aa
Connection to puppetmaster1003.eqiad.wmnet closed.
OK: puppet-merge on puppetmaster1003.eqiad.wmnet (ops) succeeded
===> Starting run on puppetmaster2001.codfw.wmnet...
Fetching new commits from: https://gerrit.wikimedia.org/r/operations/puppet
HEAD is currently 8eac157e2d8f495cb67a5b4044d0082417b33638
Updating 8eac157e2d..bfbb63cf1f
Fast-forward
hieradata/role/common/releases.yaml | 1 +
modules/admin/data/data.yaml | 4 ++++
modules/profile/manifests/releases/mwcli.pp | 9 +++++++++
modules/role/manifests/releases.pp | 1 +
4 files changed, 15 insertions(+)
create mode 100644 modules/profile/manifests/releases/mwcli.pp
Running git clean to clean any untracked files.
All done! HEAD is now bfbb63cf1fec39c02eaec33e474816d6ef8731aa
Connection to puppetmaster2001.codfw.wmnet closed.
OK: puppet-merge on puppetmaster2001.codfw.wmnet (ops) succeeded
===> Starting run on puppetmaster2002.codfw.wmnet...
Fetching new commits from: https://gerrit.wikimedia.org/r/operations/puppet
HEAD is currently 8eac157e2d8f495cb67a5b4044d0082417b33638
Updating 8eac157e2d..bfbb63cf1f
Fast-forward
hieradata/role/common/releases.yaml | 1 +
modules/admin/data/data.yaml | 4 ++++
modules/profile/manifests/releases/mwcli.pp | 9 +++++++++
modules/role/manifests/releases.pp | 1 +
4 files changed, 15 insertions(+)
create mode 100644 modules/profile/manifests/releases/mwcli.pp
Running git clean to clean any untracked files.
All done! HEAD is now bfbb63cf1fec39c02eaec33e474816d6ef8731aa
Connection to puppetmaster2002.codfw.wmnet closed.
OK: puppet-merge on puppetmaster2002.codfw.wmnet (ops) succeeded
===> Starting run on puppetmaster2003.codfw.wmnet...
Fetching new commits from: https://gerrit.wikimedia.org/r/operations/puppet
HEAD is currently 8eac157e2d8f495cb67a5b4044d0082417b33638
Updating 8eac157e2d..bfbb63cf1f
Fast-forward
hieradata/role/common/releases.yaml | 1 +
modules/admin/data/data.yaml | 4 ++++
modules/profile/manifests/releases/mwcli.pp | 9 +++++++++
modules/role/manifests/releases.pp | 1 +
4 files changed, 15 insertions(+)
create mode 100644 modules/profile/manifests/releases/mwcli.pp
Running git clean to clean any untracked files.
All done! HEAD is now bfbb63cf1fec39c02eaec33e474816d6ef8731aa
Connection to puppetmaster2003.codfw.wmnet closed.
OK: puppet-merge on puppetmaster2003.codfw.wmnet (ops) succeeded
Now running conftool-merge to sync any changes to conftool data
Running conftool-sync on /etc/conftool/data
2020-12-17 23:58:39 [INFO] conftool::load_files: Loading data for entity node from /etc/conftool/data
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/codfw.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqsin.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/eqiad.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/esams.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/node/ulsfo.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Loading data for entity discovery from /etc/conftool/data
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/services.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/discovery/mediawiki.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Loading data for entity mwconfig from /etc/conftool/data
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/mwconfig/data.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Loading data for entity dbconfig-instance from /etc/conftool/data
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/dbconfig-instance/instances.yaml
2020-12-17 23:58:39 [INFO] conftool::load_files: Loading data for entity dbconfig-section from /etc/conftool/data
2020-12-17 23:58:39 [INFO] conftool::load_files: Parsing file /etc/conftool/data/dbconfig-section/sections.yaml
2020-12-17 23:58:39 [INFO] conftool::load: Adding objects for node
2020-12-17 23:58:39 [INFO] conftool::load: Adding objects for discovery
2020-12-17 23:58:39 [INFO] conftool::load: Adding objects for mwconfig
2020-12-17 23:58:39 [INFO] conftool::load: Adding objects for dbconfig-instance
2020-12-17 23:58:39 [INFO] conftool::load: Adding objects for dbconfig-section
2020-12-17 23:58:39 [INFO] conftool::load: Removing stale objects for dbconfig-section
2020-12-17 23:58:39 [INFO] conftool::load: Removing stale objects for dbconfig-instance
2020-12-17 23:58:39 [INFO] conftool::load: Removing stale objects for mwconfig
2020-12-17 23:58:39 [INFO] conftool::load: Removing stale objects for discovery
2020-12-17 23:58:39 [INFO] conftool::load: Removing stale objects for node
Done.
Content licensed under Creative Commons Attribution-ShareAlike (CC BY-SA) 4.0 unless otherwise noted; code licensed under GNU General Public License (GPL) 2.0 or later and other open source licenses. By using this site, you agree to the Terms of Use, Privacy Policy, and Code of Conduct. · Wikimedia Foundation · Privacy Policy · Code of Conduct · Terms of Use · Disclaimer · CC-BY-SA · GPL