diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/doctor/doctor.yml | 26 | ||||
| -rw-r--r-- | jjb/doctor/docu-build.sh | 63 | ||||
| -rw-r--r-- | jjb/doctor/docu-verify.sh | 33 | ||||
| -rw-r--r-- | jjb/genesis/genesis-foreman.yml | 293 | ||||
| -rw-r--r-- | jjb/genesis/genesis-fuel.yml | 112 | ||||
| -rw-r--r-- | jjb/octopus/octopus.yml | 4 | ||||
| -rw-r--r-- | jjb/parser/docu-build.sh | 2 | ||||
| -rw-r--r-- | jjb/prediction/docu-build.sh | 2 | ||||
| -rw-r--r-- | jjb/promise/docu-build.sh | 2 |
9 files changed, 310 insertions, 227 deletions
diff --git a/jjb/doctor/doctor.yml b/jjb/doctor/doctor.yml index 54070aa32..39c20dc54 100644 --- a/jjb/doctor/doctor.yml +++ b/jjb/doctor/doctor.yml @@ -18,6 +18,8 @@ - job-template: name: doctor-test + node: master + project-type: freestyle logrotate: @@ -33,6 +35,8 @@ - job-template: name: 'doctor-daily-{stream}' + node: master + # Job template for daily builders # # Required Variables: @@ -73,10 +77,8 @@ - test-macro builders: - - shell: | - pwd - find . - echo "Hello world from doctor {somevar} daily" + - shell: + !include-raw docu-build.sh postbuilders: - test-macro @@ -84,6 +86,8 @@ - job-template: name: 'doctor-verify' + node: master + project-type: freestyle logrotate: @@ -131,14 +135,14 @@ branch-pattern: '**/master' builders: - - shell: | - pwd - find . - echo "verify logic goes here" + - shell: + !include-raw docu-verify.sh - job-template: name: 'doctor-merge' + node: master + # builder-merge job to run JJB update # # This job's purpose is to update all the JJB @@ -185,10 +189,8 @@ branch-pattern: '**/master' builders: - - shell: | - pwd - find . - echo "merge logic goes here" + - shell: + !include-raw docu-build.sh diff --git a/jjb/doctor/docu-build.sh b/jjb/doctor/docu-build.sh new file mode 100644 index 000000000..c8f159617 --- /dev/null +++ b/jjb/doctor/docu-build.sh @@ -0,0 +1,63 @@ +#!/bin/bash +set -e +set -o pipefail + +project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')" +export PATH=$PATH:/usr/local/bin/ + +git_sha1="$(git rev-parse HEAD)" +docu_build_date="$(date)" + +files=() +while read -r -d ''; do + files+=("$REPLY") +done < <(find * -type f -iname '*.rst' -print0) + +for file in "${{files[@]}}"; do + + file_cut="${{file%.*}}" + gs_cp_folder="${{file_cut}}" + + # sed part + sed -i "s/_sha1_/$git_sha1/g" $file + sed -i "s/_date_/$docu_build_date/g" $file + + # rst2html part + echo "rst2html $file" + rst2html $file | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html + gsutil setmeta -h "Content-Type:text/html" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".html + cat gsoutput.txt + rm -f gsoutput.txt + + echo "rst2pdf $file" + rst2pdf $file -o - | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".pdf + gsutil setmeta -h "Content-Type:application/pdf" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$gs_cp_folder".pdf + cat gsoutput.txt + rm -f gsoutput.txt + +done + +images=() +while read -r -d ''; do + images+=("$REPLY") +done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) + +for img in "${{images[@]}}"; do + + # uploading found images + echo "uploading $img" + cat "$img" | gsutil cp -L gsoutput.txt - \ + gs://artifacts.opnfv.org/"$project"/"$img" + gsutil setmeta -h "Content-Type:image/jpeg" \ + -h "Cache-Control:private, max-age=0, no-transform" \ + gs://artifacts.opnfv.org/"$project"/"$img" + cat gsoutput.txt + rm -f gsoutput.txt + +done diff --git a/jjb/doctor/docu-verify.sh b/jjb/doctor/docu-verify.sh new file mode 100644 index 000000000..f337a7fae --- /dev/null +++ b/jjb/doctor/docu-verify.sh @@ -0,0 +1,33 @@ +#!/bin/bash +set -e +set -o pipefail + +project="$(git remote -v | head -n1 | awk '{{print $2}}' | sed -e 's,.*:\(.*/\)\?,,' -e 's/\.git$//')" +export PATH=$PATH:/usr/local/bin/ + +git_sha1="$(git rev-parse HEAD)" +docu_build_date="$(date)" + +files=() +while read -r -d ''; do + files+=("$REPLY") +done < <(find * -type f -iname '*.rst' -print0) + +for file in "${{files[@]}}"; do + + file_cut="${{file%.*}}" + gs_cp_folder="${{file_cut}}" + + # sed part + sed -i "s/_sha1_/$git_sha1/g" $file + sed -i "s/_date_/$docu_build_date/g" $file + + # rst2html part + echo "rst2html $file" + rst2html $file > $file_cut".html" + + echo "rst2pdf $file" + rst2pdf $file -o $file_cut".pdf" + +done + diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index 7fbcc263c..bd9b22cb7 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -3,13 +3,17 @@ name: genesis-foreman + project: 'genesis' + installer: - foreman + jobs: - - 'genesis-foreman-verify' - - 'genesis-foreman-merge' - - 'genesis-foreman-daily-{stream}' - - 'genesis-foreman-deploy' + - 'genesis-{installer}-verify' + - 'genesis-{installer}-merge' + - 'genesis-{installer}-daily-{stream}' + - 'genesis-{installer}-build' + - 'genesis-{installer}-deploy' # stream: branch with - in place of / (eg. stable-helium) # branch: branch (eg. stable/helium) @@ -17,14 +21,13 @@ - master: branch: 'master' - project: 'genesis' ######################## # job templates ######################## - job-template: - name: 'genesis-foreman-verify' + name: 'genesis-{installer}-verify' project-type: freestyle @@ -38,9 +41,16 @@ parameters: - string: + name: INSTALLER + default: '{installer}' + description: "Installer to use." + - string: name: BUILD_DIRECTORY default: $WORKSPACE/build_output - string: + name: CACHE_DIRECTORY + default: '$HOME/opnfv/cache/genesis-{installer}' + - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/genesis - project-parameter: @@ -80,14 +90,14 @@ - compare-type: ANT pattern: 'common/**' - compare-type: ANT - pattern: 'foreman/**' + pattern: '{installer}/**' builders: - - 'foreman-verify' + - 'verify' - job-template: - name: 'genesis-foreman-merge' + name: 'genesis-{installer}-merge' # builder-merge job to run JJB update # @@ -105,9 +115,16 @@ parameters: - string: + name: INSTALLER + default: '{installer}' + description: "Installer to use." + - string: name: BUILD_DIRECTORY default: $WORKSPACE/build_output - string: + name: CACHE_DIRECTORY + default: '$HOME/opnfv/cache/genesis-{installer}' + - string: name: GIT_BASE default: https://gerrit.opnfv.org/gerrit/genesis - project-parameter: @@ -141,42 +158,21 @@ - compare-type: ANT pattern: 'common/**' - compare-type: ANT - pattern: 'foreman/**' + pattern: '{installer}/**' builders: - - 'foreman-merge' + - 'merge' - job-template: - name: 'genesis-foreman-daily-{stream}' + name: 'genesis-{installer}-daily-{stream}' project-type: freestyle node: ericsson-build parameters: - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - - string: - name: GS_URL - default: 'artifacts.opnfv.org/genesis/foreman' - description: "URL to Google Storage." - - string: - name: INSTALLER - default: 'foreman' - description: "Installer to use." - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/genesis - - string: - name: GERRIT_BRANCH - default: origin/master - description: "Branch to build, deploy and test." - - string: - name: GERRIT_REFSPEC - default: refs/heads/master - description: "Refspec to retrieve." + - genesis-parameters: + installer: '{installer}' scm: - git: @@ -196,11 +192,49 @@ artifactNumToKeep: -1 builders: - - 'foreman-daily-master' + - trigger-builds: + - project: 'genesis-{installer}-build' + git-revision: true + block: true + - trigger-builds: + - project: 'genesis-{installer}-deploy' + git-revision: true + block: true + - trigger-builds: + - project: 'functest-opnfv-jump-2' + block: true +- job-template: + name: 'genesis-{installer}-build' + + project-type: freestyle + + node: ericsson-build + + logrotate: + daysToKeep: 30 + numToKeep: 10 + artifactDaysToKeep: -1 + artifactNumToKeep: -1 + + parameters: + - genesis-parameters: + installer: '{installer}' + + scm: + - git: + skip-tag: true + url: $GIT_BASE + branches: + - $GERRIT_BRANCH + refspec: $GERRIT_REFSPEC + + builders: + - 'build' + - 'upload-artifact' - job-template: - name: 'genesis-foreman-deploy' + name: 'genesis-{installer}-deploy' project-type: freestyle @@ -213,13 +247,42 @@ artifactNumToKeep: -1 parameters: + - genesis-parameters: + installer: '{installer}' + + scm: + - git: + skip-tag: true + url: $GIT_BASE + branches: + - $GERRIT_BRANCH + refspec: $GERRIT_REFSPEC + + builders: + - 'deploy' + +######################## +# parameter macros +######################## +- parameter: + name: genesis-parameters + parameters: + - string: + name: INSTALLER + default: '{installer}' + description: "Installer to use." - string: name: BUILD_DIRECTORY default: $WORKSPACE/build_output + description: "Directory where the build artifact will be located upon the completion of the build." + - string: + name: CACHE_DIRECTORY + default: '$HOME/opnfv/cache/genesis-{installer}' + description: "Directory where the cache to be used during the build is located." - string: name: GIT_BASE - default: https://github.com/trozet/bgs_vagrant.git - description: "This is a temporary location to clone the needed scripts. Will be replaced with OPNFV Git URL." + default: https://gerrit.opnfv.org/gerrit/genesis + description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." - string: name: GERRIT_BRANCH default: origin/master @@ -228,27 +291,16 @@ name: GERRIT_REFSPEC default: refs/heads/master description: "Refspec to retrieve." - - scm: - - git: - skip-tag: true - url: $GIT_BASE - branches: - - $GERRIT_BRANCH - refspec: $GERRIT_REFSPEC - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - builders: - - 'foreman-deploy' + - string: + name: GS_URL + default: 'artifacts.opnfv.org/genesis/{installer}' + description: "URL to Google Storage." ######################## # builder macros ######################## - builder: - name: foreman-verify + name: 'verify' builders: - shell: | #!/bin/bash @@ -258,8 +310,8 @@ set -x # get the dependencies - temporary fix for RC0 - [[ -d $WORKSPACE/foreman/build ]] || mkdir -p $WORKSPACE/foreman/build - cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/foreman/build/ + [[ -d $WORKSPACE/$INSTALLER/build ]] || mkdir -p $WORKSPACE/$INSTALLER/build + cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/$INSTALLER/build/ # below lines perhaps need to be enabled in order to fetch images from internet # as we are having disk space issues on ericsson-build slave @@ -268,7 +320,7 @@ #wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm # do the build - cd $WORKSPACE/foreman/ci + cd $WORKSPACE/$INSTALLER/ci ./build.sh $BUILD_DIRECTORY # list the build artifacts @@ -278,7 +330,7 @@ /bin/rm -rf $BUILD_DIRECTORY - builder: - name: foreman-merge + name: 'merge' builders: - shell: | #!/bin/bash @@ -288,8 +340,8 @@ set -x # get the dependencies - temporary fix for RC0 - [[ -d $WORKSPACE/foreman/build ]] || mkdir -p $WORKSPACE/foreman/build - cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/foreman/build/ + [[ -d $WORKSPACE/$INSTALLER/build ]] || mkdir -p $WORKSPACE/$INSTALLER/build + cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/$INSTALLER/build/ # below lines perhaps need to be enabled in order to fetch images from internet # as we are having disk space issues on ericsson-build slave @@ -298,7 +350,7 @@ #wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm # do the build - cd $WORKSPACE/foreman/ci + cd $WORKSPACE/$INSTALLER/ci ./build.sh $BUILD_DIRECTORY # list the build artifacts @@ -308,108 +360,97 @@ /bin/rm -rf $BUILD_DIRECTORY - builder: - name: foreman-daily-master + name: 'build' builders: - shell: | #!/bin/bash set -o errexit set -o nounset set -o pipefail - set -x - # get the dependencies - temporary fix for RC0 - [[ -d $WORKSPACE/foreman/build ]] || mkdir -p $WORKSPACE/foreman/build - cp /home/jenkins/Downloads/opnfv_iso/* $WORKSPACE/foreman/build/ + # log info to console + echo "Starting build of $INSTALLER. This could take some time..." + echo "--------------------------------------------------------" + echo - # below lines perhaps need to be enabled in order to fetch images from internet - # as we are having disk space issues on ericsson-build slave - #wget http://ftp.riken.jp/Linux/centos/7.0.1406/isos/x86_64/CentOS-7.0-1406-x86_64-Minimal.iso - #wget http://download.virtualbox.org/virtualbox/rpm/fedora/20/x86_64/VirtualBox-4.3-4.3.26_98988_fedora18-1.x86_64.rpm - #wget http://repos.duss-janser.ch/vagrant/vagrant_1.7.2_x86_64.rpm - - # do the build - cd $WORKSPACE/foreman/ci - ./build.sh -v $BUILD_ID $BUILD_DIRECTORY - - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - set -x + # create the cache directory if it doesn't exist + [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY - # list the build artifacts - ls -al $BUILD_DIRECTORY + # set OPNFV_ARTIFACT_VERSION + export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") - cd $BUILD_DIRECTORY + # start the build + cd $WORKSPACE/$INSTALLER/ci + ./build.sh -v $OPNFV_ARTIFACT_VERSION -c file://$CACHE_DIRECTORY $BUILD_DIRECTORY # save information regarding artifact into file ( + echo "OPNFV_ARTIFACT_VERSION=$OPNFV_ARTIFACT_VERSION" echo "OPNFV_GIT_URL=$(git config --get remote.origin.url)" echo "OPNFV_GIT_SHA1=$(git rev-parse HEAD)" - echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$BUILD_ID.iso" - echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum opnfv-$ARTIFACT_VERSION.iso | cut -d' ' -f1)" + echo "OPNFV_ARTIFACT_URL=$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso" + echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" echo "OPNFV_BUILD=OK" - ) > opnfv-$BUILD_ID.properties + ) > $WORKSPACE/opnfv.properties - # copy artifact property file as latest.properties - # so we can directly get info regarding latest artifact - /bin/cp -f opnfv-$BUILD_ID.properties latest.properties - - # upload artifact and additional files to google storage - gsutil cp OPNFV-CentOS-7-x86_64-$BUILD_ID.iso gs://$GS_URL/opnfv-$BUILD_ID.iso - gsutil cp opnfv-$BUILD_ID.properties gs://$GS_URL/opnfv-$BUILD_ID.properties - gsutil cp latest.properties gs://$GS_URL/latest.properties + echo + echo "--------------------------------------------------------" + echo "Done!" +- builder: + name: 'deploy' + builders: - shell: | #!/bin/bash set -o errexit set -o nounset set -o pipefail - set -x - - # get the latest.properties file in order to get info regarding latest artifact - gsutil cp gs://$GS_URL/latest.properties latest.properties - # check if we got the file - [[ -f latest.properties ]] || exit 1 + # log info to console + echo "Startint the deployment. This could take some time..." + echo "--------------------------------------------------------" + echo - # source the file so we get OPNFV vars - source latest.properties - - # download the file - gsutil cp gs://$OPNFV_ARTIFACT_URL $WORKSPACE/opnfv.iso + # cleanup first + sudo $WORKSPACE/$INSTALLER/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml - # list the file - ls -al $WORKSPACE/opnfv.iso + # and then initiate deployment + sudo $WORKSPACE/$INSTALLER/ci/deploy.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml - # remove the BUILD_DIRECTORY and downlaoded artifact to reclaim some space - /bin/rm -rf $BUILD_DIRECTORY - /bin/rm -rf $WORKSPACE/opnfv.iso + echo + echo "--------------------------------------------------------" + echo "Done!" - builder: - name: foreman-deploy + name: 'upload-artifact' builders: - shell: | #!/bin/bash set -o errexit set -o nounset set -o pipefail - set -x - cd $WORKSPACE + # log info to console + echo "Uploading artifact. This could take some time..." + echo "--------------------------------------------------------" + echo - # fix PATH - export PATH=/usr/sbin:$PATH - echo $PATH + # list the build output + ls -al $BUILD_DIRECTORY - # messy workaround - git clone https://gist.github.com/4f2eb87d8c9937ee19f0.git lf_settings - ls -al $WORKSPACE/lf_settings + # source the opnfv.properties to get ARTIFACT_VERSION + source $WORKSPACE/opnfv.properties - # cleanup first - sudo $WORKSPACE/clean.sh -base_config $WORKSPACE/lf_settings/lf_pod2_ksgen_settings.yml + # copy artifact property file as latest.properties + # so we can directly get info regarding latest artifact + /bin/cp -f $WORKSPACE/opnfv.properties $WORKSPACE/latest.properties - # and then initiate deployment - sudo $WORKSPACE/deploy.sh -base_config $WORKSPACE/lf_settings/lf_pod2_ksgen_settings.yml + # upload artifact and additional files to google storage + gsutil cp $BUILD_DIRECTORY/OPNFV-CentOS-7-x86_64-$OPNFV_ARTIFACT_VERSION.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso + gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties + gsutil cp $WORKSPACE/latest.properties gs://$GS_URL/latest.properties + + echo + echo "--------------------------------------------------------" + echo "Done!" diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index c92c88db4..4956b4f67 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -11,7 +11,6 @@ - 'genesis-fuel-daily-{stream}' - 'genesis-fuel-build' - 'genesis-fuel-deploy' - - 'genesis-fuel-test' # stream: branch with - in place of / (eg. stable-helium) # branch: branch (eg. stable/helium) @@ -323,76 +322,9 @@ project-type: freestyle - disabled: true - - node: opnfv-jump-1 - - parameters: - - string: - name: GIT_BASE - default: https://gerrit.opnfv.org/gerrit/genesis - description: "Used for overriding the GIT URL coming from Global Jenkins configuration in case if the stuff is done on none-LF HW." - - string: - name: GERRIT_BRANCH - default: origin/master - description: "Branch to build, deploy and test." - - string: - name: GERRIT_REFSPEC - default: refs/heads/master - description: "Refspec to retrieve." - - string: - name: GS_URL - default: 'artifacts.opnfv.org/genesis/fuel' - description: "URL to Google Storage." - - string: - name: BUILD_DIRECTORY - default: $WORKSPACE/build_output - description: "Directory where the build artifact will be located upon the completion of the build." - - string: - name: CACHE_DIRECTORY - default: $HOME/opnfv/cache/genesis-fuel - description: "Cache location that is where the cache is populated and used during builds to reduce the build time." - - string: - name: ARTIFACT_VERSION - default: $BUILD_ID - description: "Version number to append to resulting ISO." - - string: - name: SKIP_BUILD - default: 0 - description: "Temporary parameter for deployment testing to skip the build and run deployment only." - - scm: - - git: - skip-tag: true - url: $GIT_BASE - branches: - - $GERRIT_BRANCH - refspec: $GERRIT_REFSPEC - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - set -x - - echo "Hello World!" - -- job-template: - name: 'genesis-fuel-test' - - project-type: freestyle - disabled: false - node: ericsson-test + node: opnfv-jump-1 parameters: - string: @@ -443,14 +375,8 @@ artifactNumToKeep: -1 builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - set -x - - echo "Hello World!" + - 'installer-download-artifact' + - 'installer-deploy' - builder: name: installer-build @@ -482,7 +408,7 @@ ls -al $BUILD_DIRECTORY - builder: - name: installer-deploy-quick-fix + name: installer-deploy builders: - shell: | #!/bin/bash @@ -491,12 +417,29 @@ set -o pipefail set -x - # this is just a quick fix to execute the deployment in a messy way - # will be fixed later on - ssh -o BatchMode=yes -o TCPKeepAlive=yes cideploy@10.118.34.205 ./cideploy.sh + # source the file so we get OPNFV vars + source latest.properties + + # echo the info about artifact that is used during the deployment + echo "Using $(echo $OPNFV_ARTIFACT_URL | cut -d'/' -f4) for deployment" + + # set TOPDIR + export TOPDIR=$WORKSPACE/fuel/prototypes/auto-deploy + + # log info to console + echo "Startint the deployment. This could take some time..." + echo "--------------------------------------------------------" + echo + + # start the deployment + echo "sudo ${TOPDIR}/deploy/deploy.sh $WORKSPACE/opnfv.iso ${TOPDIR}/configs/lf_pod1/dea.yaml ${TOPDIR}/configs/lf_pod1/dha.yaml" + + echo + echo "--------------------------------------------------------" + echo "Done!" - builder: - name: installer-test + name: installer-deploy-quick-fix builders: - shell: | #!/bin/bash @@ -505,8 +448,9 @@ set -o pipefail set -x - # run FuncTest - echo "Here is where we are supposed to run FuncTest" + # this is just a quick fix to execute the deployment in a messy way + # will be fixed later on + ssh -o BatchMode=yes -o TCPKeepAlive=yes cideploy@10.118.34.205 ./cideploy.sh - builder: name: installer-upload-artifact diff --git a/jjb/octopus/octopus.yml b/jjb/octopus/octopus.yml index 459ba7a01..db35515c9 100644 --- a/jjb/octopus/octopus.yml +++ b/jjb/octopus/octopus.yml @@ -18,8 +18,6 @@ - job-template: name: octopus-test - node: master - project-type: freestyle logrotate: @@ -133,6 +131,8 @@ - job-template: name: 'octopus-merge' + node: master + # builder-merge job to run JJB update # # This job's purpose is to update all the JJB diff --git a/jjb/parser/docu-build.sh b/jjb/parser/docu-build.sh index 7358118bd..583654c82 100644 --- a/jjb/parser/docu-build.sh +++ b/jjb/parser/docu-build.sh @@ -44,7 +44,7 @@ done images=() while read -r -d ''; do - images+=("$REPLY) + images+=("$REPLY") done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) for img in "${{images[@]}}"; do diff --git a/jjb/prediction/docu-build.sh b/jjb/prediction/docu-build.sh index 7358118bd..583654c82 100644 --- a/jjb/prediction/docu-build.sh +++ b/jjb/prediction/docu-build.sh @@ -44,7 +44,7 @@ done images=() while read -r -d ''; do - images+=("$REPLY) + images+=("$REPLY") done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) for img in "${{images[@]}}"; do diff --git a/jjb/promise/docu-build.sh b/jjb/promise/docu-build.sh index 7358118bd..583654c82 100644 --- a/jjb/promise/docu-build.sh +++ b/jjb/promise/docu-build.sh @@ -44,7 +44,7 @@ done images=() while read -r -d ''; do - images+=("$REPLY) + images+=("$REPLY") done < <(find * -type f \( -iname \*.jpg -o -iname \*.png \) -print0) for img in "${{images[@]}}"; do |