diff options
| -rw-r--r-- | jjb/bottlenecks/bottlenecks.yml | 80 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass4nfv.yml | 15 | ||||
| -rw-r--r-- | jjb/onosfw/onosfw.yml | 11 |
3 files changed, 97 insertions, 9 deletions
diff --git a/jjb/bottlenecks/bottlenecks.yml b/jjb/bottlenecks/bottlenecks.yml index 249a1bd6e..f15aa8f7c 100644 --- a/jjb/bottlenecks/bottlenecks.yml +++ b/jjb/bottlenecks/bottlenecks.yml @@ -6,7 +6,7 @@ jobs: - 'bottlenecks-verify-{stream}' - 'bottlenecks-daily-{installer}-{pod}-{stream}' - + - 'bottlenecks-upload-artifacts-{stream}' pod: - lf: node: 'opnfv-jump-2' @@ -72,6 +72,34 @@ echo "Nothing to verify!" - job-template: + name: 'bottlenecks-upload-artifacts-{stream}' + + node: ericsson-build + + concurrent: true + + properties: + - throttle: + enabled: true + max-total: 1 + max-per-node: 1 + + parameters: + - project-parameter: + project: '{project}' + - 'ericsson-ca-build-1-defaults' + + scm: + - git-scm: + credentials-id: '{ssh-credentials}' + refspec: '' + branch: '{branch}' + + builders: + - 'bottlenecks-builder-upload-artifact' + - 'bottlenecks-workspace-cleanup' + +- job-template: name: 'bottlenecks-daily-{installer}-{pod}-{stream}' disabled: false @@ -115,6 +143,25 @@ - email: recipients: hongbo.tianhongbo@huawei.com matthew.lijun@huawei.com +#################### +# parameter macros +#################### +- parameter: + name: bottlenecks-parameter + parameters: + -string: + name: CACHE_DIR + default: $WORKSPACE/cache + description: "the cache to store packages downloaded from public IP" + -string: + name: RUBBOS_URL + default: http://artifacts.opnfv.org/bottlenecks/rubbos + description: "LF artifacts url for storage of bottlenecks packages" + -string: + name: PACKAGE_URL + default: http://205.177.226.235:9999/bottlenecks/rubbos/ + description: "the url where we store the packages used for bottlenecks rubbos" + ################################### #builders for bottlenecks project ################################### @@ -176,6 +223,37 @@ ssh $CONTROL_HOST ./tmp/CONTROL_rubbos_exec.sh +- builder: + name: bottlenecks-builder-upload-artifact + builders: + - shell: | + #!/bin/bash + set -o errexit + + echo "Bottlenecks: upload to artifacts from the public IP" + + [[ -d $CACHE_DIR ]] || mkdir -p $CACHE_DIR + + for file in $(curl -s $PACKAGE_URL | + grep href | + sed 's/.*href="//' | + sed 's/".*//' | + grep '^[a-zA-Z].*'); do + curl --connect-timeout 10 -o $CACHE_DIR/$file $PACKAGE_URL$file + gsutil cp $CACHE_DIR/$file $RUBBOS_URL + done + +- builder: + name: bottlenecks-workspace-cleanup + builders: + - shell: | + #!/bin/bash + set -o errexit + + echo "Bottlenecks: cleanup cache used for storage downloaded packages" + + /bin/rm -rf $WORKSPACE + ####################### #trigger macros ####################### diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 74970fc76..f1bcee757 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -126,7 +126,7 @@ branch: '{branch}' triggers: - - timed: '@midnight' + - timed: 'H 16 * * *' builders: - trigger-builds: @@ -137,14 +137,19 @@ - project: 'compass-deploy-virtual-cluster' git-revision: true block: true -# - trigger-builds: -# - project: 'compass-deploy-virtual-cluster-odl' -# git-revision: true -# block: true + - trigger-builds: + - project: 'compass-deploy-virtual-cluster-odl' + git-revision: true + block: true - trigger-builds: - project: 'compass-deploy-virtual-cluster-onos' git-revision: true block: true + - trigger-builds: + - project: 'compass-deploy-bare-huawei-us' + git-revision: true + block: true + - job-template: name: 'compass-build-iso-{stream}' diff --git a/jjb/onosfw/onosfw.yml b/jjb/onosfw/onosfw.yml index fbeec085c..df1fdb7f3 100644 --- a/jjb/onosfw/onosfw.yml +++ b/jjb/onosfw/onosfw.yml @@ -60,7 +60,7 @@ pattern: 'docs/**|.gitignore' builders: - - 'builder-onosfw-build' + - 'builder-onosfw-helloworld' - job-template: name: 'onosfw-daily-{stream}' @@ -100,8 +100,7 @@ branch: '{branch}' builders: - - 'builder-onosfw-build' - - 'builder-onosfw-upload-artifact' + - 'builder-onosfw-helloworld' @@ -178,3 +177,9 @@ echo "Artifact is available as http://$GS_BASE/opnfv-$OPNFV_ARTIFACT_VERSION.iso" +- builder: + name: 'builder-onosfw-helloworld' + builders: + - shell: | + #!/bin/bash + echo "Hello world!" |