From: Thanh Ha <thanh.ha@linuxfoundation.org>
Date: Fri, 14 Sep 2018 01:01:20 +0000 (-0400)
Subject: Update all maven jobs to use lf-infra-pre-build
X-Git-Tag: v0.24.3~2
X-Git-Url: https://gerrit.linuxfoundation.org/infra/gitweb?a=commitdiff_plain;h=refs%2Fchanges%2F95%2F12595%2F1;p=releng%2Fglobal-jjb.git

Update all maven 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 pip==18.0.
This is related to the lftools-venv series of patches.

Change-Id: Ida0b27957460871d7dce4e78df3297bb1a72b7ca
Signed-off-by: Thanh Ha <thanh.ha@linuxfoundation.org>
---

diff --git a/jjb/lf-maven-jobs.yaml b/jjb/lf-maven-jobs.yaml
index 81c5fd25..93b4be50 100644
--- a/jjb/lf-maven-jobs.yaml
+++ b/jjb/lf-maven-jobs.yaml
@@ -72,7 +72,9 @@
     name: lf-maven-stage
     builders:
       # include-raw-escape fails due to JJB bug
-      - shell: !include-raw: ../shell/maven-stage.sh
+      - shell: !include-raw:
+          - ../shell/common-variables.sh
+          - ../shell/maven-stage.sh
 
 - builder:
     name: lf-update-java-alternatives
@@ -204,6 +206,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -332,6 +335,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -346,7 +350,6 @@
       - shell: !include-raw-escape:
           - ../shell/common-variables.sh
           - ../shell/maven-javadoc-generate.sh
-          - ../shell/lftools-install.sh
           - ../shell/maven-javadoc-publish.sh
       - lf-provide-maven-settings-cleanup
 
@@ -460,6 +463,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-maven-install:
           mvn-version: '{mvn-version}'
       - lf-update-java-alternatives:
@@ -581,6 +585,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -595,9 +600,7 @@
           properties-content: |
               NEXUS_CUT_DIRS={nexus-cut-dirs}
               NEXUS_REPO={nexus-snapshot-repo}
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
-          - ../shell/maven-fetch-metadata.sh
+      - shell: !include-raw-escape: ../shell/maven-fetch-metadata.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
       - lf-maven-deploy
@@ -892,6 +895,7 @@
             notbuilt: true
 
     builders:
+      - lf-infra-pre-build
       - lf-infra-maven-sonar:
           java-version: '{java-version}'
           mvn-settings: '{mvn-settings}'
@@ -1020,6 +1024,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
@@ -1028,8 +1033,6 @@
       - lf-provide-maven-settings:
           global-settings-file: '{mvn-global-settings}'
           settings-file: '{mvn-settings}'
-      - shell: !include-raw-escape:
-          - ../shell/lftools-install.sh
       - lf-maven-build:
           mvn-goals: '{mvn-goals}'
       - lf-provide-maven-settings-cleanup
@@ -1141,6 +1144,7 @@
     disabled: '{disable-job}'
 
     builders:
+      - lf-infra-pre-build
       - lf-jacoco-nojava-workaround
       - lf-maven-install:
           mvn-version: '{mvn-version}'
diff --git a/shell/maven-build-deps.sh b/shell/maven-build-deps.sh
index 3ff3f24f..8583d90a 100644
--- a/shell/maven-build-deps.sh
+++ b/shell/maven-build-deps.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
diff --git a/shell/maven-build.sh b/shell/maven-build.sh
index c00aa06f..1f619546 100644
--- a/shell/maven-build.sh
+++ b/shell/maven-build.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
diff --git a/shell/maven-fetch-metadata.sh b/shell/maven-fetch-metadata.sh
index ebffa96f..26b2c96e 100644
--- a/shell/maven-fetch-metadata.sh
+++ b/shell/maven-fetch-metadata.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
diff --git a/shell/maven-javadoc-generate.sh b/shell/maven-javadoc-generate.sh
index 891f60bc..7919242c 100644
--- a/shell/maven-javadoc-generate.sh
+++ b/shell/maven-javadoc-generate.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
diff --git a/shell/maven-patch-release.sh b/shell/maven-patch-release.sh
index cc3c8b83..d7c4577a 100644
--- a/shell/maven-patch-release.sh
+++ b/shell/maven-patch-release.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.
diff --git a/shell/maven-sonar.sh b/shell/maven-sonar.sh
index e0c0477d..58572341 100644
--- a/shell/maven-sonar.sh
+++ b/shell/maven-sonar.sh
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/bash -l
 # SPDX-License-Identifier: EPL-1.0
 ##############################################################################
 # Copyright (c) 2017 The Linux Foundation and others.