From: Thanh Ha Date: Fri, 14 Sep 2018 00:28:44 +0000 (-0400) Subject: Update rtd jobs to use lf-infra-pre-build X-Git-Tag: v0.25.0~9^2 X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F92%2F12592%2F3;p=releng%2Fglobal-jjb.git 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. Change-Id: I3aa48d98811a7469fba15fe4c3eb7474bc7b5196 Signed-off-by: Thanh Ha --- diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml index 59b249f2..10b070d8 100644 --- a/jjb/lf-macros.yaml +++ b/jjb/lf-macros.yaml @@ -224,9 +224,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-sign-dir diff --git a/jjb/lf-rtd-jobs.yaml b/jjb/lf-rtd-jobs.yaml index b7ddf616..acc23896 100644 --- a/jjb/lf-rtd-jobs.yaml +++ b/jjb/lf-rtd-jobs.yaml @@ -88,6 +88,7 @@ disabled: '{disable-job}' builders: + - lf-infra-pre-build - lf-rtd-trigger-build: rtd-build-url: '{rtd-build-url}' rtd-token: '{rtd-token}' @@ -181,6 +182,7 @@ disabled: '{disable-job}' builders: + - lf-infra-pre-build - lf-rtd-verify: doc-dir: '{doc-dir}' diff --git a/releasenotes/notes/rtd-pbr-install-fail-e41fb287485fb4c5.yaml b/releasenotes/notes/rtd-pbr-install-fail-e41fb287485fb4c5.yaml new file mode 100644 index 00000000..8e05acad --- /dev/null +++ b/releasenotes/notes/rtd-pbr-install-fail-e41fb287485fb4c5.yaml @@ -0,0 +1,4 @@ +--- +fixes: + - | + Fix RTD job failing to find PBR install. 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.