Page MenuHomePhabricator

'portals' git submodule does not update on beta ( under /srv/mediawiki-staging )
Closed, ResolvedPublic

Description

Just dealt with T122017: Warning when loading config, but there's also this:

krenair@deployment-bastion:/srv/mediawiki-staging$ git diff
diff --git a/portals b/portals
index 551a95c..bb5e1de 160000
--- a/portals
+++ b/portals
@@ -1 +1 @@
-Subproject commit 551a95c80bb0fe9055043c274bcad236833cba1a
+Subproject commit bb5e1de8fdeefcdef5ac3e750ca2adfbaf212462

Seems like the portals submodule does not update properly on beta:

$ git log --oneline --color --decorate HEAD^..origin/HEAD
551a95c (origin/master, origin/HEAD) Remove first a/b test
f409e46 EL 'country' data
c0db3cf Merge "Fixes Chrome-specific bug."
22de117 Fix formatting issues not passing gulp lint
e870c4f Fixes Chrome-specific bug.
204ef39 adding gulp watch task and refactoring gulpfile.js
080b480 Merge "EL 'country' data: checking for GeoIP cookie before making GeoIP request."
2ee9195 Merge "Generate stats over 1 week period"
83573d7 Generate stats over 1 week period
2091adb EL 'country' data: checking for GeoIP cookie before making GeoIP request.
6362bf0 Merge "Sending 'country' property to www.wikipedia.org event logging analytics."
ff08e08 Synchronized non-WP portals with Meta
cfd71f2 Sending 'country' property to www.wikipedia.org event logging analytics.
bb5e1de (HEAD) First A/B Test: - Increases the input size and the button size,  with primary colors and search icon

Details

Related Objects

Event Timeline

Krenair raised the priority of this task from to Needs Triage.
Krenair updated the task description. (Show Details)
Krenair subscribed.
Restricted Application added subscribers: StudiesWorld, Aklapper. · View Herald Transcript
hashar renamed this task from git submodules under /srv/mediawiki-staging in beta to 'portals' git submodule does not update on beta ( under /srv/mediawiki-staging ).Dec 21 2015, 10:31 AM
hashar updated the task description. (Show Details)
hashar set Security to None.
hashar subscribed.

Looks the portals submodule is not properly updated for some reason.

The portals is part of operations/mediawiki-config.git which is updated via the job beta-mediawiki-config-update-eqiad.

It uses the script /usr/local/bin/wmf-beta-mwconfig-update which is in puppet.git and does:

# Directory containing checkout to update
TARGET_DIR="<%= @stage_dir %>"

set -x
pwd
cd "$TARGET_DIR"
pwd
git remote update
git reset --hard "$ZUUL_COMMIT"
git tag "jenkins_build_$BUILD_NUMBER" "$ZUUL_COMMIT"
touch wmf-config/InitialiseSettings.php

So seems none of the submodule ever got checked out / updated properly? The last submodule bump has been done via https://gerrit.wikimedia.org/r/#/c/259176/

Change 260338 had a related patch set uploaded (by Hashar):
beta: update submodules for mediawiki-config

https://gerrit.wikimedia.org/r/260338

I have cherry picked https://gerrit.wikimedia.org/r/#/c/260338/ on beta puppetmaster. Should get the submodule processed now.

hashar triaged this task as Medium priority.Dec 21 2015, 10:50 AM
hashar moved this task from Backlog to Archive on the Continuous-Integration-Config board.
hashar moved this task from To Triage to Externally Blocked on the Beta-Cluster-Infrastructure board.

Should be good now. Pending merge of Gerrit patch by ops.

Change 260338 merged by Dzahn:
beta: update submodules for mediawiki-config

https://gerrit.wikimedia.org/r/260338

hashar added a subscriber: Dzahn.

@Dzahn merged the puppet change (thank you). Should be fine now.