Merge "onuTarget parameter Configuration"
diff --git a/global-jjb b/global-jjb
index ff33e05..34c9b08 160000
--- a/global-jjb
+++ b/global-jjb
@@ -1 +1 @@
-Subproject commit ff33e05030b95c28f28f1317f6ac713080e8a5fa
+Subproject commit 34c9b08438fd4314e0a5ffed414f367c282a700a
diff --git a/jjb/pipeline/voltha-physical-build-and-tests.groovy b/jjb/pipeline/voltha-physical-build-and-tests.groovy
index 3f9eda8..0769878 100644
--- a/jjb/pipeline/voltha-physical-build-and-tests.groovy
+++ b/jjb/pipeline/voltha-physical-build-and-tests.groovy
@@ -278,7 +278,7 @@
stage('Run E2E Tests') {
environment {
ROBOT_CONFIG_FILE="${localDeploymentConfigFile}"
- ROBOT_MISC_ARGS="${params.extraRobotArgs} --removekeywords wuks -d $WORKSPACE/RobotLogs "
+ ROBOT_MISC_ARGS="${params.extraRobotArgs} --removekeywords wuks -d $WORKSPACE/RobotLogs -v container_log_dir:$WORKSPACE "
ROBOT_FILE="Voltha_PODTests.robot"
}
steps {
diff --git a/jjb/pipeline/voltha-physical-functional-tests.groovy b/jjb/pipeline/voltha-physical-functional-tests.groovy
index 5695c81..549101f 100644
--- a/jjb/pipeline/voltha-physical-functional-tests.groovy
+++ b/jjb/pipeline/voltha-physical-functional-tests.groovy
@@ -73,9 +73,9 @@
kail -n voltha -n default --since=20m > $WORKSPACE/Functional_onos-voltha-combined.log &
mkdir -p $ROBOT_LOGS_DIR
if ( ${released} ); then
- export ROBOT_MISC_ARGS="--removekeywords wuks -i released -i sanity -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -i released -i sanity -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
else
- export ROBOT_MISC_ARGS="--removekeywords wuks -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -e bbsim -e notready -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
fi
make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
sync
@@ -97,7 +97,7 @@
sh """
kail -n voltha -n default > $WORKSPACE/FailureScenarios_onos-voltha-combined.log &
mkdir -p $ROBOT_LOGS_DIR
- export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
sync
pkill kail || true
@@ -118,7 +118,7 @@
sh """
kail -n voltha -n default > $WORKSPACE/ErrorScenarios_onos-voltha-combined.log &
mkdir -p $ROBOT_LOGS_DIR
- export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir}"
+ export ROBOT_MISC_ARGS="--removekeywords wuks -L TRACE -i functional -d $ROBOT_LOGS_DIR -v POD_NAME:${configFileName} -v KUBERNETES_CONFIGS_DIR:$WORKSPACE/${configBaseDir}/${configKubernetesDir} -v container_log_dir:$WORKSPACE"
make -C $WORKSPACE/voltha/voltha-system-tests voltha-test || true
sync
pkill kail || true
diff --git a/packer/provision/basebuild.sh b/packer/provision/basebuild.sh
index 87dc516..19e3876 100644
--- a/packer/provision/basebuild.sh
+++ b/packer/provision/basebuild.sh
@@ -22,6 +22,9 @@
# set up ansible repo
apt-add-repository -y ppa:ansible/ansible
+ # set up git backports repo
+ add-apt-repository -y ppa:git-core/ppa
+
# set up docker repo
apt-key adv --keyserver keyserver.ubuntu.com --recv 0EBFCD88
add-apt-repository \
@@ -199,9 +202,9 @@
go install ./protoc-gen-go
popd
- # install repo launcher v1.13.8
- REPO_B64_SHA256SUM="ac7058283b4e2b51db31a79632c3e2f809d8f6270217d280fcc52f1325e69960"
- curl -o /tmp/repo.b64 'https://gerrit.googlesource.com/git-repo/+/refs/tags/v1.13.8/repo?format=TEXT'
+ # install repo launcher v2.0
+ REPO_B64_SHA256SUM="f34b0743ae46105df575f116fc6535a5d9db10c575e03e11e2932e2a8745061e"
+ curl -o /tmp/repo.b64 'https://gerrit.googlesource.com/git-repo/+/refs/tags/v2.0/repo?format=TEXT'
echo "$REPO_B64_SHA256SUM /tmp/repo.b64" | sha256sum -c -
base64 --decode /tmp/repo.b64 > /tmp/repo
mv /tmp/repo /usr/local/bin/repo