commit a5c231f9ad94af916ff79cf271772c33ffa6ba4a
author Kailash Khalasi <kailash@onlab.us> Sat Feb 23 22:51:41 2019 +0000
committer Gerrit Code Review <gerrit@opencord.org> Sat Feb 23 22:51:41 2019 +0000
tree 6c86fdf6aae66ad2507b64b3023b44ddb66da38d
parent fea8b2d83ad861e89cee3def0084ae9c03d9c19f
parent 1314a3203c5e724b8c0763e031dfef69cc360952

Merge "archiving robot logs to directories in xos-migration tests"

jjb/cord-test/att-workflow.yaml

diff --git a/jjb/cord-test/att-workflow.yaml b/jjb/cord-test/att-workflow.yaml
index fd78119..89af3da 100644
--- a/jjb/cord-test/att-workflow.yaml
+++ b/jjb/cord-test/att-workflow.yaml
@@ -53,7 +53,7 @@
          branch: 'master'
          Jenkinsfile: 'Jenkinsfile-attworkflow-build'
          oltDebVersion: 'openolt-master.deb'
-         time: '9'
+         time: '*/3'
 
       # flex pod1 with olt/onu - seba-1.0/cord-6.1 release
       - 'build_pod_timer':

jjb/shell/xos-unit.sh

diff --git a/jjb/shell/xos-unit.sh b/jjb/shell/xos-unit.sh
index 9203a62..8ddc9d9 100644
--- a/jjb/shell/xos-unit.sh
+++ b/jjb/shell/xos-unit.sh
@@ -36,7 +36,11 @@
 fi
 
 echo "Checking Migrations"
-xos-migrate -r $WORKSPACE/cord -s $GERRIT_PROJECT --check -v
+if [ "$GERRIT_PROJECT" = 'xos' ] ; then
+  xos-migrate -r $WORKSPACE/cord -s core --check
+else
+  xos-migrate -r $WORKSPACE/cord -s $GERRIT_PROJECT --check
+fi
 
 echo "Performing nose2 tests"
 nose2 --verbose --coverage-report xml --coverage-report term --junit-xml

jjb/xos-integration-tests.yaml

diff --git a/jjb/xos-integration-tests.yaml b/jjb/xos-integration-tests.yaml
index db4a9bc..f0096ca 100644
--- a/jjb/xos-integration-tests.yaml
+++ b/jjb/xos-integration-tests.yaml
@@ -107,5 +107,5 @@
 
     triggers:
       - reverse:
-          jobs: 'publish_imagebuilder'
+          jobs: 'publish-imagebuilder'
           result: 'success'