diff options
Diffstat (limited to 'apex')
-rw-r--r-- | apex/builders/common_builder.py | 2 | ||||
-rw-r--r-- | apex/common/constants.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py index 10fab9b6..a5f301b8 100644 --- a/apex/builders/common_builder.py +++ b/apex/builders/common_builder.py @@ -175,7 +175,7 @@ def add_upstream_patches(patches, image, tmp_dir, patch['project'], branch, patch['change-id']) patch_promoted = is_patch_promoted(change, - branch.replace('/stable', ''), + branch.replace('stable/', ''), docker_img) if patch_diff and not patch_promoted: diff --git a/apex/common/constants.py b/apex/common/constants.py index ee260b4f..2a10b3b2 100644 --- a/apex/common/constants.py +++ b/apex/common/constants.py @@ -41,7 +41,7 @@ THT_DIR = '/usr/share/openstack-tripleo-heat-templates' THT_ENV_DIR = os.path.join(THT_DIR, 'environments') THT_DOCKER_ENV_DIR = { 'master': os.path.join(THT_ENV_DIR, 'services'), - 'queens': os.path.join(THT_ENV_DIR, 'services-docker') + 'queens': os.path.join(THT_ENV_DIR, 'services') } DEFAULT_OS_VERSION = 'master' |