summaryrefslogtreecommitdiffstats
path: root/apex/builders/common_builder.py
diff options
context:
space:
mode:
authorTim Rozet <trozet@redhat.com>2018-07-16 13:49:21 -0400
committerTim Rozet <trozet@redhat.com>2018-07-17 17:34:02 -0400
commit6b9d8c01be763bbf46048caa08902880367672a7 (patch)
tree9388f549db33b8b862ba65641575fde170ea0e88 /apex/builders/common_builder.py
parentb5e2f1f65dee0cd692fe275d6bce69a8e410cac3 (diff)
Update queens ODL to include OF table fix
Also includes minor fix to patching where stable was not being removed from the short hand branch name correctly. Includes fix where path was changed in queens for env files: https://review.openstack.org/#/c/567810/ Change-Id: Ia3a6769be70ea97c9bec9d5539c9ab0373fed30a Signed-off-by: Tim Rozet <trozet@redhat.com>
Diffstat (limited to 'apex/builders/common_builder.py')
-rw-r--r--apex/builders/common_builder.py2
1 files changed, 1 insertions, 1 deletions
diff --git a/apex/builders/common_builder.py b/apex/builders/common_builder.py
index 10fab9b..a5f301b 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: