jenkins-bot has submitted this change and it was merged. (
https://gerrit.wikimedia.org/r/391745 )
Change subject: Clean up branch referencing logic, should fix scap prep on
master
......................................................................
Clean up branch referencing logic, should fix scap prep on master
While I'm here, do a copytree() on the patches directory to save
some prep work
Change-Id: Ic41728fcc42730ce38fd583591a6316792cbc0cb
---
M scap/plugins/prep.py
1 file changed, 17 insertions(+), 13 deletions(-)
Approvals:
Chad: Looks good to me, approved
jenkins-bot: Verified
diff --git a/scap/plugins/prep.py b/scap/plugins/prep.py
index b207f9c..971352a 100644
--- a/scap/plugins/prep.py
+++ b/scap/plugins/prep.py
@@ -8,6 +8,7 @@
import multiprocessing
import os
import re
+import shutil
import subprocess
import scap.cli as cli
@@ -90,19 +91,26 @@
self.config['stage_dir'],
'{}{}'.format(self.arguments.prefix, self.arguments.branch)
)
- old_branch = self.active_wikiversions().keys()[0]
- copy_dir = os.path.join(
- self.config['stage_dir'],
- '{}{}'.format(self.arguments.prefix, old_branch)
- )
+
+ checkout_version = 'master'
+ if self.arguments.branch != 'master':
+ checkout_version = 'wmf/%s' % self.arguments.branch
+
+ reference_dir = None
+ if checkout_version != 'master':
+ old_branch = self.active_wikiversions().keys()[0]
+ reference_dir = os.path.join(
+ self.config['stage_dir'],
+ '{}{}'.format(self.arguments.prefix, old_branch)
+ )
+ shutil.copytree(
+ os.path.join('/srv/patches', old_branch),
+ os.path.join('/srv/patches', self.arguments.branch)
+ )
if os.path.isdir(dest_dir):
self.get_logger().info('Version already checked out')
return 0
-
- reference_dir = None
- if os.path.isdir(copy_dir):
- reference_dir = copy_dir
git.fetch(dest_dir, GERRIT_URL + 'mediawiki/core', reference_dir)
@@ -115,10 +123,6 @@
if subprocess.call(['/usr/bin/git', 'config',
'submodule.fetchJobs', num_procs]) != 0:
self.get_logger().warn('Unable to setup submodule fetch jobs')
-
- checkout_version = 'master'
- if self.arguments.branch != 'master':
- checkout_version = 'wmf/%s' % self.arguments.branch
git.checkout(dest_dir, checkout_version)
--
To view, visit https://gerrit.wikimedia.org/r/391745
To unsubscribe, visit https://gerrit.wikimedia.org/r/settings
Gerrit-MessageType: merged
Gerrit-Change-Id: Ic41728fcc42730ce38fd583591a6316792cbc0cb
Gerrit-PatchSet: 3
Gerrit-Project: operations/mediawiki-config
Gerrit-Branch: master
Gerrit-Owner: Chad <[email protected]>
Gerrit-Reviewer: Chad <[email protected]>
Gerrit-Reviewer: Thcipriani <[email protected]>
Gerrit-Reviewer: Urbanecm <[email protected]>
Gerrit-Reviewer: Zoranzoki21 <[email protected]>
Gerrit-Reviewer: jenkins-bot <>
_______________________________________________
MediaWiki-commits mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
