Awight has uploaded a new change for review. https://gerrit.wikimedia.org/r/203187
Change subject: CiviCRM job can be run concurrently ...................................................................... CiviCRM job can be run concurrently Bug: T91895 Change-Id: I2ffcf42ebe1e9fea23ef81e3540cb2aa9377e266 --- M jjb/wm-fundraising.yaml 1 file changed, 3 insertions(+), 7 deletions(-) git pull ssh://gerrit.wikimedia.org:29418/integration/config refs/changes/87/203187/1 diff --git a/jjb/wm-fundraising.yaml b/jjb/wm-fundraising.yaml index 0e84f7b..aeb3ecf 100644 --- a/jjb/wm-fundraising.yaml +++ b/jjb/wm-fundraising.yaml @@ -50,12 +50,10 @@ - postbuildscript: builders: - shell: | - # FIXME: Some junk gets left behind (e.g. database dsn), which - # corrupts later runs. Remove it. Ideally this cache would - # be stored under $WORKSPACE and would be cleaned up without - # an additional step. Also, this causes a race condition, - # the job can run concurrently once we fix this cache dir. + # Symlink the .amp cache directory for easy cleanup. + mkdir -p $WORKSPACE/.amp rm -rf $HOME/.amp + ln -s $WORKSPACE/.amp $HOME/.amp # Drop the MySQL databases. $WORKSPACE/src/wikimedia/fundraising/crm/bin/ci-drop-dbs.sh @@ -74,8 +72,6 @@ name: wikimedia-fundraising-civicrm # Run on isolated boxes because of messy MySQL behavior and unsafe fetches. node: contintLabsSlave && UbuntuTrusty - # FIXME: due to the ~/.amp thing. - concurrent: false triggers: - zuul builders: -- To view, visit https://gerrit.wikimedia.org/r/203187 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: newchange Gerrit-Change-Id: I2ffcf42ebe1e9fea23ef81e3540cb2aa9377e266 Gerrit-PatchSet: 1 Gerrit-Project: integration/config Gerrit-Branch: master Gerrit-Owner: Awight <awi...@wikimedia.org> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits