Add sanity test for voltha-system-tests
- Also fix the comments-indentation lint error
- Checkout the gerrit patchset branch during the pipline stage.
Change-Id: Id98140dabf35c285fd1b967f94dfc311585621ed
diff --git a/jjb/cord-test/seba-release.yaml b/jjb/cord-test/seba-release.yaml
index 5b43eb0..2e9ae98 100644
--- a/jjb/cord-test/seba-release.yaml
+++ b/jjb/cord-test/seba-release.yaml
@@ -53,56 +53,56 @@
Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
oltDebVersion: 'openolt-master.deb'
- # flex OCP pod with olt/onu - release 2.0 build job
- # - 'build_pod_release':
- # testvm: 'qa-testvm-pod'
- # config-pod: 'flex-ocp-cord'
- # release: '1.0'
- # branch: 'cord-6.1'
- # Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
- # oltDebVersion: 'openolt-master-voltha16.deb'
- # time: '3'
+ # # flex OCP pod with olt/onu - release 2.0 build job
+ # - 'build_pod_release':
+ # testvm: 'qa-testvm-pod'
+ # config-pod: 'flex-ocp-cord'
+ # release: '1.0'
+ # branch: 'cord-6.1'
+ # Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+ # oltDebVersion: 'openolt-master-voltha16.deb'
+ # time: '3'
- # flex OCP pod with olt/onu - release 2.0 build job
- # - 'build_pod_release':
- # testvm: 'qa-testvm-pod'
- # config-pod: 'flex-ocp-cord'
- # release: '2.0'
- # branch: 'master'
- # Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
- # oltDebVersion: 'openolt-master.deb'
- # time: '5'
-
- # flex OCP POD with olt/onu - release 1.0 test job
- # - 'build_pod_release_test':
- # testvm: 'qa-testvm-pod'
- # config-pod: 'flex-ocp-cord'
- # release: '1.0'
- # branch: 'cord-6.1'
- # Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
- # flex OCP POD with olt/onu - release 2.0 test job
- # - 'build_pod_release_test':
- # testvm: 'qa-testvm-pod'
- # config-pod: 'flex-ocp-cord'
- # release: '2.0'
- # branch: 'master'
- # Jenkinsfile: 'Jenkinsfile-attworkflow-test'
-
- # flex OCP pod with olt/onu : using voltha latest(master)
- # - 'build_pod_release':
- # testvm: 'qa-testvm-pod'
- # config-pod: 'flex-ocp-cord'
- # release: '2.0-microcharts'
- # branch: 'master'
- # Jenkinsfile: 'Jenkinsfile-attworkflow-build'
- # oltDebVersion: 'openolt-master.deb'
- # time: '7'
-
- # flex OCP test job - release 2.0 test job
- # - 'build_pod_release_test':
- # testvm: 'qa-testvm-pod'
- # config-pod: 'flex-ocp-cord'
- # release: '2.0-microcharts'
- # branch: 'master'
- # Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+ # # flex OCP pod with olt/onu - release 2.0 build job
+ # - 'build_pod_release':
+ # testvm: 'qa-testvm-pod'
+ # config-pod: 'flex-ocp-cord'
+ # release: '2.0'
+ # branch: 'master'
+ # Jenkinsfile: 'Jenkinsfile-attworkflow-build-released-ver'
+ # oltDebVersion: 'openolt-master.deb'
+ # time: '5'
+ #
+ # # flex OCP POD with olt/onu - release 1.0 test job
+ # - 'build_pod_release_test':
+ # testvm: 'qa-testvm-pod'
+ # config-pod: 'flex-ocp-cord'
+ # release: '1.0'
+ # branch: 'cord-6.1'
+ # Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+ #
+ # # flex OCP POD with olt/onu - release 2.0 test job
+ # - 'build_pod_release_test':
+ # testvm: 'qa-testvm-pod'
+ # config-pod: 'flex-ocp-cord'
+ # release: '2.0'
+ # branch: 'master'
+ # Jenkinsfile: 'Jenkinsfile-attworkflow-test'
+ #
+ # # flex OCP pod with olt/onu : using voltha latest(master)
+ # - 'build_pod_release':
+ # testvm: 'qa-testvm-pod'
+ # config-pod: 'flex-ocp-cord'
+ # release: '2.0-microcharts'
+ # branch: 'master'
+ # Jenkinsfile: 'Jenkinsfile-attworkflow-build'
+ # oltDebVersion: 'openolt-master.deb'
+ # time: '7'
+ #
+ # # flex OCP test job - release 2.0 test job
+ # - 'build_pod_release_test':
+ # testvm: 'qa-testvm-pod'
+ # config-pod: 'flex-ocp-cord'
+ # release: '2.0-microcharts'
+ # branch: 'master'
+ # Jenkinsfile: 'Jenkinsfile-attworkflow-test'
diff --git a/jjb/cord-test/voltha.yaml b/jjb/cord-test/voltha.yaml
index 4b01b54..2b11e9d 100644
--- a/jjb/cord-test/voltha.yaml
+++ b/jjb/cord-test/voltha.yaml
@@ -41,7 +41,7 @@
configurePod: true
time: '1'
- # flex pod1 test job - using voltha branch
+ # flex pod1 test job - using voltha branch
- 'build_voltha_pod_test':
testvm: 'qa-testvm-pod'
config-pod: 'flex-ocp-cord'
diff --git a/jjb/defaults.yaml b/jjb/defaults.yaml
index 5781e9d..8dbfa63 100644
--- a/jjb/defaults.yaml
+++ b/jjb/defaults.yaml
@@ -126,7 +126,7 @@
code-files-regexp: '^(?!docs|VERSION|\/COMMIT_MSG).*$'
api-test-files-regexp: '^(?!docs|VERSION|\/COMMIT_MSG|Jenkinsfile-*).*$'
- # Jenkins SSH host doc publisher
+ # Jenkins SSH host doc publisher
docs-ssh-host: 'guide.opencord.org'
docs-ssh-host-key: 'guide.opencord.org,52.9.82.207 ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBFHwOY3/8GucdKzBngH/FC08nHac/RJ/OheZp2+5EpOPXZG9zQW2YUbXH5A9pO76lI5CG3z3+huG62xEGo99UQU='
diff --git a/jjb/opencord.yaml b/jjb/opencord.yaml
index a6668ae..42e7728 100644
--- a/jjb/opencord.yaml
+++ b/jjb/opencord.yaml
@@ -8,8 +8,8 @@
blackduck-project: cord
jobs:
-# - 'synopsys-periodic-check':
-# build-node: "ubuntu16.04-basebuild-2c-4g"
-# git-server-url: "{gerrit-server-url}"
+ # - 'synopsys-periodic-check':
+ # build-node: "ubuntu16.04-basebuild-2c-4g"
+ # git-server-url: "{gerrit-server-url}"
- 'synopsys-merge-check'
diff --git a/jjb/pipeline/voltha-bbsim-tests.groovy b/jjb/pipeline/voltha-bbsim-tests.groovy
index 00ebb68..4d1c010 100644
--- a/jjb/pipeline/voltha-bbsim-tests.groovy
+++ b/jjb/pipeline/voltha-bbsim-tests.groovy
@@ -58,7 +58,6 @@
stage('Create K8s Cluster') {
steps {
sh """
- git clone https://gerrit.opencord.org/voltha-system-tests
git clone https://github.com/ciena/kind-voltha.git
cd kind-voltha/
DEPLOY_K8S=y JUST_K8S=y FANCY=0 ./voltha up
@@ -69,7 +68,7 @@
stage('Build Images') {
steps {
sh """
- if [ "${gerritProject}" != "voltha-helm-charts" ]; then
+ if ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests)\$ ]]; then
cd $WORKSPACE/voltha/${gerritProject}/
make DOCKER_REPOSITORY=voltha/ DOCKER_TAG=citest docker-build
fi
@@ -80,8 +79,7 @@
stage('Push Images') {
steps {
sh '''
- if [ "${gerritProject}" != "voltha-helm-charts" ]; then
-
+ if ! [[ "${gerritProject}" =~ ^(voltha-helm-charts|voltha-system-tests)\$ ]]; then
export GOROOT=/usr/local/go
export GOPATH=\$(pwd)
export TYPE=minimal
@@ -100,7 +98,7 @@
HELM_FLAG="--set defaults.image_tag=voltha-2.1,wpa_wait=10,dhcp_wait=10 "
if [ "${gerritProject}" = "voltha-go" ]; then
- HELM_FLAG+="-f $WORKSPACE/voltha-system-tests/tests/data/ci-test.yaml "
+ HELM_FLAG+="-f $WORKSPACE/voltha/voltha-system-tests/tests/data/ci-test.yaml "
fi
if [ "${gerritProject}" = "voltha-openolt-adapter" ]; then
@@ -158,7 +156,7 @@
set +e
# copy robot logs
if [ -d RobotLogs ]; then rm -r RobotLogs; fi; mkdir RobotLogs
- cp -r $WORKSPACE/voltha-system-tests/tests/sanity/*ml ./RobotLogs || true
+ cp -r $WORKSPACE/voltha/voltha-system-tests/tests/sanity/*ml ./RobotLogs || true
cd kind-voltha/
cp install-minimal.log $WORKSPACE/
export KUBECONFIG="$(./bin/kind get kubeconfig-path --name="voltha-minimal")"
diff --git a/jjb/verify/voltha-system-tests.yaml b/jjb/verify/voltha-system-tests.yaml
index ba934a5..d08ec2f 100644
--- a/jjb/verify/voltha-system-tests.yaml
+++ b/jjb/verify/voltha-system-tests.yaml
@@ -19,4 +19,7 @@
dependency-jobs: 'verify_voltha-system-tests_tag-collision'
unit-test-targets: 'lint'
junit-allow-empty-results: true
-
+ - 'voltha-patch-test':
+ build-timeout: 20
+ pipeline: 'voltha-bbsim-tests.groovy'
+ dependency-jobs: 'verify_voltha-system-tests_unit-test'