From f27a70c4bd9051c80f84bf1141986f75bbb7ab49 Mon Sep 17 00:00:00 2001 From: Sebastian Riemer Date: Tue, 31 Jan 2012 14:51:56 +0100 Subject: [PATCH] added feature branch support --- kernel_inpbuilder.py | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/kernel_inpbuilder.py b/kernel_inpbuilder.py index 66905fe..81c6bdb 100644 --- a/kernel_inpbuilder.py +++ b/kernel_inpbuilder.py @@ -266,6 +266,8 @@ def determine_kernel_flavour(): debian_version = '$(version)-%s+%s' % (pb_version, REVISION) elif GIT_BRANCH_NAME.startswith('release') or GIT_BRANCH_NAME.startswith('hotfix'): debian_version = '$(version)-%s~rc%s' % (pb_version, REVISION) + elif GIT_BRANCH_NAME.startswith('feature'): + debian_version = '$(version)-%s~experimental%s' % (pb_version, REVISION) else: debian_version = '$(version)-%s~develop%s' % (pb_version, REVISION) @@ -314,7 +316,6 @@ def install_extra_modules(): return True - if __name__ == '__main__': logger = logging.getLogger(sys.argv[0]) logger.setLevel(logging.DEBUG) @@ -444,7 +445,10 @@ if __name__ == '__main__': logger.error('Cannot login via ftp...') exit(ERROR) - ftp.cwd('/srv/profitbricks-repository/incoming') + if GIT_BRANCH_NAME.startswith('feature'): + ftp.cwd('/srv/dev-repository/incoming') + else: + ftp.cwd('/srv/profitbricks-repository/incoming') logger.info('FTP Login on %s successful' %(ftp.host)) @@ -452,6 +456,8 @@ if __name__ == '__main__': ftp.cwd('production-proposed-updates') elif GIT_BRANCH_NAME.startswith('release/') or GIT_BRANCH_NAME.startswith('hotfix/'): ftp.cwd('staging'); + elif GIT_BRANCH_NAME.startswith('feature'): + ftp.cwd('experimental'); else: ftp.cwd('pre-staging'); logger.info('FTP working directory: %s' %(ftp.pwd())) -- 2.39.5