From: Benjamin Drung <benjamin.drung@profitbricks.com>
Date: Mon, 21 Jul 2014 09:07:04 +0000 (+0200)
Subject: debian_build.py: Rename apt01 to repo01 again (to avoid confusion with app01).
X-Git-Url: https://git.uhu-banane.net/?a=commitdiff_plain;h=bb7ce5fef14d3758640f0976218a92a24f9a8591;p=profitbricks%2Fjenkins-build-scripts.git

debian_build.py: Rename apt01 to repo01 again (to avoid confusion with app01).
---

diff --git a/debian_build.py b/debian_build.py
index 0f09be8..70eac93 100755
--- a/debian_build.py
+++ b/debian_build.py
@@ -121,10 +121,10 @@ def upload_to_apt_repository(apt_target, apt_dist, changes_file, logger):
             logger.debug('%s succeeded.' % command)
         else:
             logger.warn('%s failed.' % command)
-            figlet('apt01 upload failed')
+            figlet('repo01 upload failed')
             return False
         (head, tail) = os.path.splitext(changes_file)
-        new_changes_file = head + '_apt01' + tail
+        new_changes_file = head + '_repo01' + tail
         filehandle = open(new_changes_file, 'w')
         filehandle.write(changes)
         filehandle.close()
@@ -135,14 +135,14 @@ def upload_to_apt_repository(apt_target, apt_dist, changes_file, logger):
         success = subprocess.call(cmd) == 0
         if success:
             logger.debug('%s succeeded.' % command)
-            figlet('apt01 upload OK')
+            figlet('repo01 upload OK')
         else:
             logger.warn('%s failed.' % command)
-            figlet('apt01 upload failed')
+            figlet('repo01 upload failed')
     except Exception as error:
-        logger.warning("Upload to http://apt01.pb.local failed. "
+        logger.warning("Upload to http://repo.pb.local failed. "
                        "See above for details.", exc_info=error)
-        figlet('apt01 upload failed')
+        figlet('repo01 upload failed')
         success = False
     return success
 
@@ -299,7 +299,7 @@ if __name__ == '__main__':
         pb_suite = 'master-{dist}'.format(dist=curr_dist)
         reprepro_base = '/srv/pb-{dist}'.format(dist=curr_dist)
         apt_dist = curr_dist
-        apt_target = "apt01-debian"
+        apt_target = "repo01-debian"
 
         # replace valid debian version chars that are invalid for git tagging
         new_tag = curr_version.replace('~', '_').replace(':', ',')
@@ -355,7 +355,7 @@ if __name__ == '__main__':
         pb_suite = 'develop-{dist}'.format(dist=curr_dist)
         reprepro_base = '/srv/pb-{dist}'.format(dist=curr_dist)
         apt_dist = curr_dist + '-dev'
-        apt_target = "apt01-debian-dev"
+        apt_target = "repo01-debian-dev"
         # reset actions
         # .. always include successful build packages into CIDB
         if curr_dist == 'squeeze':
@@ -382,7 +382,7 @@ if __name__ == '__main__':
         new_version = version_substitution(logger, pattern, curr_commit)
         reprepro_base = '/srv/dev-{dist}'.format(dist=curr_dist)
         apt_dist = curr_dist + "-" + local_branch.replace("/", "-")
-        apt_target = "apt01-debian-dev"
+        apt_target = "repo01-debian-dev"
 
     else:
         logger.error('Don\'t know how to handle branch "{branch}".'.format(
@@ -770,7 +770,7 @@ export {builder_env} FORCE_SHELL=TRUE
             ))
             fh.close()
 
-            # upload to new apt01 archive
+            # upload to new repo01 archive
             if not upload_to_apt_repository(apt_target, apt_dist, changes_file, logger):
                 exit_error()