Merge "updating mcord-build-test job to redeploy prior to build"
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 0495467..1b80360 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -19,3 +19,4 @@
project-name: 'ci-management'
jjb-version: 2.0.5
+ packer-version: 1.2.4
diff --git a/jjb/pipeline/kubespray-install.groovy b/jjb/pipeline/kubespray-install.groovy
index 676f514..607a6c4 100644
--- a/jjb/pipeline/kubespray-install.groovy
+++ b/jjb/pipeline/kubespray-install.groovy
@@ -8,9 +8,14 @@
}
stages {
+ stage ("Clean workspace") {
+ steps {
+ sh 'rm -rf *'
+ }
+ }
+
stage ("Parse deployment configuration file") {
steps {
- sh returnStdout: true, script: 'rm -rf ${configRepoBaseDir}'
sh returnStdout: true, script: 'git clone -b ${branch} ${configRepoUrl}'
script { deployment_config = readYaml file: "${configRepoBaseDir}${configRepoFile}" }
}
@@ -28,23 +33,23 @@
stage ('Install Kubespray on Nodes') {
steps {
- sh '''
+ sh """
pushd $WORKSPACE/automation-tools/kubespray-installer
./setup.sh -i flex-onf-pod1 ${deployment_config.node1.ip} ${deployment_config.node2.ip} ${deployment_config.node3.ip}
popd
- '''
+ """
}
}
stage ('Validate Kube Config File') {
steps {
- sh '''
+ sh """
pushd $WORKSPACE/automation-tools/kubespray-installer/configs
- #Validate the conf file
- export KUBECONFIG=$WORKSPACE/automation-tools/kubespray-installer/configs${deployment_config.pod_config}
+ ls -al
+ export KUBECONFIG=$WORKSPACE/automation-tools/kubespray-installer/configs/${deployment_config.pod_config}
kubectl get pods
popd
- '''
+ """
}
}
}
diff --git a/jjb/shell/licensecheck.sh b/jjb/shell/licensecheck.sh
index d0b2347..3d64307 100755
--- a/jjb/shell/licensecheck.sh
+++ b/jjb/shell/licensecheck.sh
@@ -58,6 +58,7 @@
! -name "*.oar" \
! -name "*.p12" \
! -name "*.patch" \
+ ! -name "*.pdf" \
! -name "*.pcap" \
! -name "*.pem" \
! -name "*.png" \
diff --git a/jjb/verify/voltha.yaml b/jjb/verify/voltha.yaml
index ad6d589..b0b972c 100644
--- a/jjb/verify/voltha.yaml
+++ b/jjb/verify/voltha.yaml
@@ -15,6 +15,7 @@
- 'verify-licensed'
- 'verify-sonarqube':
dependency-jobs: 'verify_voltha_licensed'
+ build-timeout: 20
- 'voltha-unit-test':
dependency-jobs: 'verify_voltha_sonarqube'
diff --git a/jjb/voltha-unit-test.yaml b/jjb/voltha-unit-test.yaml
index 3d01448..610b0d4 100644
--- a/jjb/voltha-unit-test.yaml
+++ b/jjb/voltha-unit-test.yaml
@@ -42,10 +42,24 @@
builders:
- shell: |
#!/usr/bin/env bash
- set -eu -o pipefail
+ set -e -o pipefail
rm -rf venv-linux
source ./env.sh
make utest-with-coverage
+ publishers:
+ - junit:
+ results: "**/nosetests.xml"
+ - cobertura:
+ report-file: "**/coverage.xml"
+ targets:
+ - files:
+ healthy: 80
+ unhealthy: 0
+ failing: 0
+ - method:
+ healthy: 50
+ unhealthy: 0
+ failing: 0
diff --git a/packer/common-packer b/packer/common-packer
index edc12fd..4a5b0cd 160000
--- a/packer/common-packer
+++ b/packer/common-packer
@@ -1 +1 @@
-Subproject commit edc12fdbd0d43bd54bdd79dfd16d349506a16bb7
+Subproject commit 4a5b0cd9032938194c4813fe36663ddee4f9e60e
diff --git a/packer/provision/baseline.sh b/packer/provision/baseline.sh
index a087efa..e34d7b8 100644
--- a/packer/provision/baseline.sh
+++ b/packer/provision/baseline.sh
@@ -213,8 +213,14 @@
echo "---> Updating operating system"
+ # Change made 2018-07-09 by zdw
+ # per discussion on #lf-releng, the upstream Ubuntu image changed to be
+ # missing add-apt-repository, so the next command failed.
+ apt-get update -m
+ apt-get install -y software-properties-common
+
# add additional repositories
- sudo add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
+ add-apt-repository "deb http://us.archive.ubuntu.com/ubuntu $(lsb_release -sc) main universe restricted multiverse"
echo "---> Installing base packages"
apt-get clean