Page MenuHomePhabricator

beta-mediawiki-config-update-eqiad failing with merge conflict in portals
Closed, ResolvedPublic

Description

See the log:
https://integration.wikimedia.org/ci/job/beta-mediawiki-config-update-eqiad/4456/console

21:03:05 + cd /srv/mediawiki-staging
21:03:05 + pwd
21:03:05 /srv/mediawiki-staging
21:03:05 + git remote update
21:03:05 Fetching origin
21:03:06 From https://gerrit.wikimedia.org/r/p/operations/mediawiki-config
21:03:06    b61215c..2d11e75  master     -> origin/master
21:03:06 + git reset --hard 2d11e7534bece3664ac87a3cc1621ea24fb57db6
21:03:06 HEAD is now at 2d11e75 w/static/current symlinks
21:03:06 + git tag jenkins_build_4456 2d11e7534bece3664ac87a3cc1621ea24fb57db6
21:03:06 + git submodule update --init --rebase
21:03:07 First, rewinding head to replay your work on top of it...
21:03:07 Applying: Deploy the A/B/C test search box code to the search-box feature branch, to enable working on top of it
21:03:07 Applying: Display a blue button with a magnifying glass
21:03:07 Applying: Improving cross-browser CSS
21:03:07 Using index info to reconstruct a base tree...
21:03:07 M	gulpfile.js
21:03:07 M	package.json
21:03:07 M	prod/wikipedia.org/index.html
21:03:07 Falling back to patching base and 3-way merge...
21:03:07 Auto-merging prod/wikipedia.org/index.html
21:03:07 Removing prod/wikipedia.org/assets/js/index-992f5860ac.js
21:03:07 Auto-merging package.json
21:03:07 Auto-merging gulpfile.js
21:03:07 CONFLICT (content): Merge conflict in gulpfile.js
21:03:07 Auto-merging dev/wikipedia.org/assets/postcss/style.css
21:03:07 Auto-merging dev/wikipedia.org/assets/postcss/_wm-portal.css
21:03:07 Auto-merging dev/wikipedia.org/assets/postcss/_pab2.css
21:03:07 Auto-merging dev/wikipedia.org/assets/postcss/_pab1.css
21:03:07 Auto-merging dev/wikipedia.org/assets/postcss/_buttons.css
21:03:07 Removing dev/wikipedia.org/assets/cssnext/README.txt
21:03:07 Recorded preimage for 'gulpfile.js'
21:03:07 Failed to merge in the changes.
21:03:07 Patch failed at 0003 Improving cross-browser CSS
21:03:07 The copy of the patch that failed is found in:
21:03:07    /mnt/srv/mediawiki-staging/.git/modules/portals/rebase-apply/patch
21:03:07 
21:03:07 When you have resolved this problem, run "git rebase --continue".
21:03:07 If you prefer to skip this patch, run "git rebase --skip" instead.
21:03:07 To check out the original branch and stop rebasing, run "git rebase --abort".
21:03:07 
21:03:07 Unable to rebase '2e57bfbd83acce979a25bf213dfd9b44310e3ec2' in submodule path 'portals'
21:03:07 Build step 'Execute shell' marked build as failure

Event Timeline

Restricted Application added a subscriber: Aklapper. · View Herald Transcript
greg raised the priority of this task from High to Unbreak Now!.Mar 10 2016, 12:30 AM

This is breaking all the time now on each new mw-config change being propagated to Beta Cluster.
https://integration.wikimedia.org/ci/job/beta-mediawiki-config-update-eqiad/

Change 276397 had a related patch set uploaded (by EBernhardson):
Create a portal-master dir in beta to serve master branch of portals

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

EBernhardson lowered the priority of this task from Unbreak Now! to High.Mar 10 2016, 5:12 PM

The puppet patch linked above has been cherry-picked to deployment-puppetmaster and appears to be working as necessary. Reducing from unbreak-now, but not closing as we need to merge the patch and not just have it hanging around as a cherry-pick.

Change 276397 merged by Gehel:
Create a portal-master dir in beta to serve master branch of portals

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

hashar added a subscriber: hashar.

Havent seen this one happening again. I am assuming it is fixed