kamp/fdroidserver
1
0
Fork 0
mirror of https://gitlab.com/fdroid/fdroidserver.git synced 2024-11-18 20:50:10 +01:00
Code Activity

deploy: remove git remotes not enabled in servergitmirrors

Browse Source 
If the repo operator removes an item from servergitmirrors, it should auto-
matically remove the remote.
This commit is contained in:
Hans-Christoph Steiner 2020-07-09 09:34:04 +02:00
parent 5d28eec115
commit 10fa912c16
2 changed files with 23 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
fdroidserver/server.py
View File

@ -45,6 +45,7 @@ BINARY_TRANSPARENCY_DIR = 'binary_transparency'
AUTO_S3CFG = '.fdroid-server-update-s3cfg' AUTO_S3CFG = '.fdroid-server-update-s3cfg'
USER_S3CFG = 's3cfg' USER_S3CFG = 's3cfg'
REMOTE_HOSTNAME_REGEX = re.compile(r'\W*\w+\W+(\w+).*')
def update_awsbucket(repo_section): def update_awsbucket(repo_section):
@ -384,15 +385,17 @@ def update_servergitmirrors(servergitmirrors, repo_section):
repo = git.Repo.init(git_mirror_path) repo = git.Repo.init(git_mirror_path)
enabled_remotes = []
for remote_url in servergitmirrors: for remote_url in servergitmirrors:
hostname = re.sub(r'\W*\w+\W+(\w+).*', r'\1', remote_url) name = REMOTE_HOSTNAME_REGEX.sub(r'\1', remote_url)
r = git.remote.Remote(repo, hostname) enabled_remotes.append(name)
r = git.remote.Remote(repo, name)
if r in repo.remotes: if r in repo.remotes:
r = repo.remote(hostname) r = repo.remote(name)
if 'set_url' in dir(r): # force remote URL if using GitPython 2.x if 'set_url' in dir(r): # force remote URL if using GitPython 2.x
r.set_url(remote_url) r.set_url(remote_url)
else: else:
repo.create_remote(hostname, remote_url) repo.create_remote(name, remote_url)
logging.info('Mirroring to: ' + remote_url) logging.info('Mirroring to: ' + remote_url)
# sadly index.add don't allow the --all parameter # sadly index.add don't allow the --all parameter
@ -414,6 +417,9 @@ def update_servergitmirrors(servergitmirrors, repo_section):
# push for every remote. This will overwrite the git history # push for every remote. This will overwrite the git history
for remote in repo.remotes: for remote in repo.remotes:
if remote.name not in enabled_remotes:
repo.delete_remote(remote)
continue
if remote.name == 'gitlab': if remote.name == 'gitlab':
logging.debug('Writing .gitlab-ci.yml to deploy to GitLab Pages') logging.debug('Writing .gitlab-ci.yml to deploy to GitLab Pages')
with open(os.path.join(git_mirror_path, ".gitlab-ci.yml"), "wt") as out_file: with open(os.path.join(git_mirror_path, ".gitlab-ci.yml"), "wt") as out_file:

13
tests/server.TestCase
View File

@ -148,6 +148,19 @@ class ServerTest(unittest.TestCase):
virustotal_apikey = os.getenv('VIRUSTOTAL_API_KEY') virustotal_apikey = os.getenv('VIRUSTOTAL_API_KEY')
fdroidserver.server.upload_to_virustotal('repo', virustotal_apikey) fdroidserver.server.upload_to_virustotal('repo', virustotal_apikey)
def test_remote_hostname_regex(self):
for remote_url, name in (
('git@github.com:guardianproject/fdroid-repo', 'github'),
('git@gitlab.com:guardianproject/fdroid-repo', 'gitlab'),
('https://github.com:guardianproject/fdroid-repo', 'github'),
('https://gitlab.com/guardianproject/fdroid-repo', 'gitlab'),
('https://salsa.debian.org/foo/repo', 'salsa'),
):
self.assertEqual(
name,
fdroidserver.server.REMOTE_HOSTNAME_REGEX.sub(r'\1', remote_url)
)
if __name__ == "__main__": if __name__ == "__main__":
os.chdir(os.path.dirname(__file__)) os.chdir(os.path.dirname(__file__))