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 <thanh.ha@linuxfoundation.org>

diff --git a/jjb/lf-macros.yaml b/jjb/lf-macros.yaml
index 59b249f..10b070d 100644 (file)
--- 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 b7ddf61..acc2389 100644 (file)
--- 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 (file)
index 0000000..8e05aca
--- /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 7f403eb..810a87c 100644 (file)
--- 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.