From 5957fbdd1eb1c38af3cf59fffedf8ebe1060d196 Mon Sep 17 00:00:00 2001 From: Thanh Ha Date: Thu, 13 Sep 2018 20:28:44 -0400 Subject: [PATCH] Update rtd jobs to use lf-infra-pre-build Use lf-infra-pre-build to install lftools via --user config. This resolves the post-build install failing with missing PBR version. This is related to the lftools-venv series of patches. Change-Id: I3aa48d98811a7469fba15fe4c3eb7474bc7b5196 Signed-off-by: Thanh Ha --- jjb/lf-macros.yaml | 5 ++--- jjb/lf-rtd-jobs.yaml | 2 ++ shell/rtd-verify.sh | 2 +- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 5188417a..ab74f910 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -234,9 +234,8 @@ builders: - inject: properties-content: DOC_DIR={doc-dir} - - shell: !include-raw-escape: - - ../shell/tox-install.sh - - ../shell/rtd-verify.sh + - shell: !include-raw-escape: ../shell/tox-install.sh + - shell: !include-raw-escape: ../shell/rtd-verify.sh - builder: name: lf-sigul-install diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index 16409187..8f64f1fc 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -101,6 +101,7 @@ disabled: '{disable-job}' builders: + - lf-infra-pre-build - lf-rtd-trigger-build: rtd-build-url: '{rtd-build-url}' rtd-token: '{rtd-token}' @@ -194,6 +195,7 @@ disabled: '{disable-job}' builders: + - lf-infra-pre-build - lf-rtd-verify: doc-dir: '{doc-dir}' diff --git a/shell/rtd-verify.sh b/shell/rtd-verify.sh index 7f403ebb..810a87cb 100644 --- a/shell/rtd-verify.sh +++ b/shell/rtd-verify.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -l # SPDX-License-Identifier: EPL-1.0 ############################################################################## # Copyright (c) 2017 The Linux Foundation and others. -- 2.16.6