From 6b9d8c01be763bbf46048caa08902880367672a7 Mon Sep 17 00:00:00 2001 From: Tim Rozet Date: Mon, 16 Jul 2018 13:49:21 -0400 Subject: 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 --- apex/builders/common_builder.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'apex/builders') 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: -- cgit 1.2.3-korg