From: Christopher Lott (cl778h) <clott@research.att.com>
Date: Tue, 6 Feb 2018 16:11:18 +0000 (-0500)
Subject: Repair shell-include directive
X-Git-Tag: v0.16.0~7
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=be559eba3d91bcf9e0eebe1199843cb918fa1b49;p=releng%2Fglobal-jjb.git

Repair shell-include directive

Change stage macro to use include-raw instead of include-raw-escape to
work around a JJB bug that inserts lftools_activate with double braces.

Change-Id: Iec5e0b12a287f1945eedc895a25dd16e74b47082
Signed-off-by: Christopher Lott (cl778h) <clott@research.att.com>
---

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index f127e91c..cd3172b1 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -71,7 +71,8 @@
 - builder:
     name: lf-maven-stage
     builders:
-      - shell: !include-raw-escape:
+      # include-raw-escape fails due to JJB bug
+      - shell: !include-raw:
           - ../shell/common-variables.sh
           - ../shell/maven-stage.sh