From 4fc71abfd87ac77bc0864e9e973e275610edaa82 Mon Sep 17 00:00:00 2001 From: Sebastian Wagner Date: Tue, 14 Jul 2020 12:07:59 +0200 Subject: [PATCH] build-integration-branch: Append stable branch name For stable wip- branches, build matching flavors according to https://github.com/tchaikov/ceph-build/blob/master/ceph-dev-trigger/config/definitions/ceph-dev-trigger.yml Signed-off-by: Sebastian Wagner --- src/script/build-integration-branch | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/script/build-integration-branch b/src/script/build-integration-branch index 7430237ceceb..f5cc4c10644e 100755 --- a/src/script/build-integration-branch +++ b/src/script/build-integration-branch @@ -24,7 +24,7 @@ from __future__ import print_function import json import os import requests -from subprocess import call +from subprocess import call, check_output import sys import time try: @@ -35,6 +35,11 @@ except: TIME_FORMAT = '%Y-%m-%d-%H%M' postfix = "-" + time.strftime(TIME_FORMAT, time.localtime()) +current_branch = check_output('git rev-parse --abbrev-ref HEAD', shell=True).strip().decode() +if current_branch in 'mimic nautilus octopus pacific'.split(): + postfix += '-' + current_branch + print(f"Adding current branch name '-{current_branch}' as a postfix") + repo = "ceph/ceph" try: -- 2.47.3