From f44e1be2c5f93b75e0922ff9f45f4996c55455d4 Mon Sep 17 00:00:00 2001 From: Christian Rebischke <chris@nullday.de> Date: Fri, 9 Aug 2019 03:25:48 +0200 Subject: [PATCH] changed status code and reformat code Now we exit with status code 0, otherwise we will hit our monitoring to often Signed-off-by: Christian Rebischke <chris@nullday.de> --- controller.py | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/controller.py b/controller.py index b1cc474..a5624da 100644 --- a/controller.py +++ b/controller.py @@ -19,13 +19,13 @@ ISO_PATH = '/srv/ftp/iso/latest/archlinux-' + datetime.datetime.now().strftime( "%Y.%m") + '.01-x86_64.iso' ISO_CHECKSUM_PATH = '/srv/ftp/iso/latest/sha1sums.txt' PACKER_CMD_TEMPLATE = [ - "/usr/bin/packer", "build", "parallel=false", "-var", - "'headless=true'", "-var", "'write_zeroes=yes'", - "-except=vmware-iso", "vagrant.json" + "/usr/bin/packer", "build", "parallel=false", "-var", "'headless=true'", + "-var", "'write_zeroes=yes'", "-except=vmware-iso", "vagrant.json" ] + def main(): - are_resources_present() + exit_if_resources_present() with urllib.request.urlopen(API_URL) as response: data = json.load(response) release_version = data['current_version']['version'] @@ -37,26 +37,25 @@ def main(): determine_missing_release(release_providers) -def are_resources_present(): +def exit_if_resources_present(): if os.path.exists(ISO_PATH) and os.path.exists(ISO_CHECKSUM_PATH): pass else: - sys.exit(1) + sys.exit(0) def build_packer_call(provider): - provider_map = { - "virtualbox": "virtualbox", - "libvirt": "qemu" - } + provider_map = {"virtualbox": "virtualbox", "libvirt": "qemu"} packer = PACKER_CMD_TEMPLATE.copy() packer[7] += "," packer[7] += provider_map[provider] return packer - + + def determine_missing_release(release_providers): subprocess.call(build_packer_call(release_providers[0]['name']), cwd=CWD) + def is_latest(release_version): release_month = int(release_version.split(".")[1]) return THIS_MONTH <= release_month -- GitLab