diff options
| -rwxr-xr-x | jjb/armband/armband-deploy.sh | 3 | ||||
| -rw-r--r-- | jjb/ovsnfv/ovsnfv.yml | 45 |
2 files changed, 26 insertions, 22 deletions
diff --git a/jjb/armband/armband-deploy.sh b/jjb/armband/armband-deploy.sh index d6a78e2d6..97430c114 100755 --- a/jjb/armband/armband-deploy.sh +++ b/jjb/armband/armband-deploy.sh @@ -72,6 +72,9 @@ echo "Issuing command" echo "$DEPLOY_COMMAND" echo +# FIXME +export TARGET_LAB=${LAB_NAME} +export TARGET_POD=${POD_NAME} $DEPLOY_COMMAND echo diff --git a/jjb/ovsnfv/ovsnfv.yml b/jjb/ovsnfv/ovsnfv.yml index 6f6d29012..dbe0a25fa 100644 --- a/jjb/ovsnfv/ovsnfv.yml +++ b/jjb/ovsnfv/ovsnfv.yml @@ -54,16 +54,14 @@ branches: - branch-compare-type: 'ANT' branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'build/**' + - compare-type: ANT + pattern: 'ci/**' builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - - cd $WORKSPACE/ci - ./build.sh + - build-rpms - job-template: name: 'ovsnfv-merge-{stream}' @@ -100,18 +98,16 @@ - project-compare-type: 'ANT' project-pattern: '{project}' branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/{branch}' + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + file-paths: + - compare-type: ANT + pattern: 'build/**' + - compare-type: ANT + pattern: 'ci/**' builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - - cd $WORKSPACE/ci - ./build.sh + - build-rpms - job-template: name: 'ovsnfv-daily-{stream}' @@ -140,6 +136,15 @@ - timed: '@midnight' builders: + - build-rpms + + publishers: + - email: + recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com + +- builder: + name: build-rpms + builders: - shell: | #!/bin/bash set -o errexit @@ -148,7 +153,3 @@ cd $WORKSPACE/ci ./build.sh - - publishers: - - email: - recipients: therbert@redhat.com mark.d.gray@intel.com billy.o.mahony@intel.com |