Code Review
/
releng
/
global-jjb.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Fix: Workaround for yaml multiline string
[releng/global-jjb.git]
/
shell
/
common-variables.sh
diff --git
a/shell/common-variables.sh
b/shell/common-variables.sh
index
7bbc36f
..
0001ac8
100644
(file)
--- a/
shell/common-variables.sh
+++ b/
shell/common-variables.sh
@@
-1,4
+1,4
@@
-#!/bin/bash
+#!/bin/bash
-l
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
# SPDX-License-Identifier: EPL-1.0
##############################################################################
# Copyright (c) 2017 The Linux Foundation and others.
@@
-8,22
+8,17
@@
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
##############################################################################
# which accompanies this distribution, and is available at
# http://www.eclipse.org/legal/epl-v10.html
##############################################################################
-
+echo "---> common-variables.sh"
# This file contains a list of variables that are generally useful in many
# scripts. It is meant to be sourced in other scripts so that the variables can
# be called.
# This file contains a list of variables that are generally useful in many
# scripts. It is meant to be sourced in other scripts so that the variables can
# be called.
+# shellcheck disable=SC2140
MAVEN_OPTIONS="$(echo --show-version \
--batch-mode \
-Djenkins \
MAVEN_OPTIONS="$(echo --show-version \
--batch-mode \
-Djenkins \
- -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn \
+ "-Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer"\
+".Slf4jMavenTransferListener=warn" \
-Dmaven.repo.local=/tmp/r \
-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
echo "$MAVEN_OPTIONS"
-Dmaven.repo.local=/tmp/r \
-Dorg.ops4j.pax.url.mvn.localRepository=/tmp/r)"
echo "$MAVEN_OPTIONS"
-
-# Activates the lftools virtualenv
-lftools_activate() {
- virtualenv --quiet "/tmp/v/lftools"
- # shellcheck source=/tmp/v/lftools/bin/activate disable=SC1091
- source "/tmp/v/lftools/bin/activate"
-}