diff options
Diffstat (limited to 'jjb')
| -rw-r--r--[-rwxr-xr-x] | jjb/compass4nfv/compass4nfv.yml | 130 | ||||
| -rw-r--r-- | jjb/functest/functest.yml | 9 | ||||
| -rw-r--r-- | jjb/genesis/genesis-foreman.yml | 3 | ||||
| -rw-r--r-- | jjb/genesis/genesis-fuel.yml | 14 | ||||
| -rw-r--r-- | jjb/opnfv/opnfv-docs.yml (renamed from jjb/releng/releng.yml) | 56 | ||||
| -rw-r--r-- | jjb/releng-jobs.yaml | 4 | ||||
| -rwxr-xr-x | jjb/releng/docu-build-new.sh | 109 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 4 |
8 files changed, 86 insertions, 243 deletions
diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 5b6336681..468c06252 100755..100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -8,7 +8,6 @@ jobs: - 'compass-verify' - 'compass-verify-on-ericsson-node' - - 'compass-upload-iso' - 'compass-merge' - 'compass-daily-{stream}' - 'compass-build' @@ -22,10 +21,10 @@ flavor: - five: - conf: 'five' + conf: 'virtual_five' node: 'huawei-build' - cluster: - conf: 'cluster' + conf: 'virtual_cluster' node: 'huawei-build' @@ -36,38 +35,11 @@ # job templates ######################## - job-template: - name: 'compass-upload-iso' - project-type: freestyle - disabled: false - - node: master - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - project-parameter: - project: '{project}' - - compass-parameter: - installer: '{installer}' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - builders: - - 'compass-copy-artifact' - - 'compass-upload-artifact' - -- job-template: name: 'compass-verify-on-ericsson-node' project-type: freestyle - disabled: false + disabled: true node: ericsson-build @@ -116,7 +88,7 @@ builders: - 'compass-build' - + - 'compass-workspace-cleanup' - job-template: name: 'compass-verify' @@ -140,7 +112,10 @@ branch: 'master' - compass-parameter: installer: '{installer}' - + - string: + name: FLAVOR_CONF + default: 'virtual_cluster' + description: "" scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -172,7 +147,7 @@ builders: - 'compass-build' - #- 'compass-workspace-cleanup' + #- 'compass-deploy-virtual-flavor' - job-template: name: 'compass-merge' @@ -198,6 +173,7 @@ branch: 'master' - compass-parameter: installer: '{installer}' + scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' @@ -261,7 +237,7 @@ publishers: - trigger: - project: 'compass-deploy-virtual-five' + project: 'compass-build' threshold: SUCCESS - trigger: project: 'compass-deploy-virtual-cluster' @@ -272,7 +248,7 @@ project-type: freestyle - node: huawei-build + node: ericsson-build logrotate: daysToKeep: 30 @@ -294,17 +270,9 @@ builders: - 'compass-build' + - 'compass-upload-artifact' - 'compass-workspace-cleanup' - publishers: - - archive: - artifacts: '$BUILD_DIRECTORY/*.*' - allow-empty: 'true' - fingerprint: true - - trigger: - project: 'compass-upload-iso' - threshold: SUCCESS - - job-template: name: 'compass-deploy-virtual-{flavor}' @@ -335,6 +303,7 @@ builders: - 'compass-ci-preclean-workspace' + - 'compass-download-artifact' - 'compass-deploy-virtual-flavor' ######################## @@ -349,11 +318,11 @@ description: "Installer to use." - string: name: BUILD_DIRECTORY - default: build_output + 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/$INSTALLER + default: $HOME/opnfv/cache/$PROJECT description: "Directory where the cache to be used during the build is located." - string: name: GIT_BASE @@ -361,29 +330,22 @@ 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: GS_URL - default: artifacts.opnfv.org/$PROJECT/$INSTALLER + default: artifacts.opnfv.org/$PROJECT/ description: "URL to Google Storage." - string: - name: INTERNAL_REPO + name: GS_URL_PROXY + default: build.opnfv.org/artifacts/$PROJECT/ + description: "URL to Google Storage proxy" + - string: + name: INTERNAL_REPO_XA default: "root@192.168.127.11:~/xh/work/build/work" description: "Artifact Repository" + + ######################## # builder macros ######################## - builder: - name: compass-copy-artifact - builders: - - copyartifact: - project: "compass-build" - filter: "$BUILD_DIRECTORY/compass.iso, $BUILD_DIRECTORY/opnfv.properties" - target: ./ - which-build: upstream-build - optional: true - flatten: true - parameter-filters: PUBLISH=true - - -- builder: name: compass-merge builders: - shell: | @@ -391,6 +353,7 @@ echo "Hello World!" + - builder: name: 'compass-build' builders: @@ -407,18 +370,17 @@ # create the cache directory if it doesn't exist [[ -d $CACHE_DIRECTORY ]] || mkdir -p $CACHE_DIRECTORY + [[ -d $BUILD_DIRECTORY ]] || mkdir -p $BUILD_DIRECTORY # set OPNFV_ARTIFACT_VERSION export OPNFV_ARTIFACT_VERSION=$(date -u +"%Y-%m-%d_%H-%M-%S") # start the build - cd $WORKSPACE/ci - ./build.sh - mkdir $WORKSPACE/$BUILD_DIRECTORY - mv $WORKSPACE/ci/work/compass.iso $WORKSPACE/$BUILD_DIRECTORY/ + cd $WORKSPACE/ + ./build.sh --iso-dir $BUILD_DIRECTORY/ --iso-name compass.iso -c $CACHE_DIRECTORY # list the build artifacts - ls -al $WORKSPACE/$BUILD_DIRECTORY + ls -al $BUILD_DIRECTORY # save information regarding artifact into file ( @@ -426,27 +388,14 @@ 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-$OPNFV_ARTIFACT_VERSION.iso" - echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $WORKSPACE/$BUILD_DIRECTORY/compass.iso | cut -d' ' -f1)" + echo "OPNFV_ARTIFACT_MD5SUM=$(md5sum $BUILD_DIRECTORY/compass.iso | cut -d' ' -f1)" echo "OPNFV_BUILD_URL=$BUILD_URL" - ) > $WORKSPACE/$BUILD_DIRECTORY/opnfv.properties - + ) > $BUILD_DIRECTORY/opnfv.properties echo echo "--------------------------------------------------------" echo "Done!" - builder: - name: 'compass-deploy' - builders: - - shell: | - #!/bin/bash - set -o errexit - set -o nounset - set -o pipefail - - # log info to console - echo "Hello world!" - -- builder: name: 'compass-deploy-virtual-flavor' builders: - shell: | @@ -460,9 +409,9 @@ echo "--------------------------------------------------------" echo + export ISO_URL=file://$BUILD_DIRECTORY/compass.iso cd $WORKSPACE - ./ci/deploy.sh $FLAVOR_CONF - # ssh -o BatchMode=yes -o TCPKeepAlive=yes cideploy@10.118.34.205 ./cideploy.sh + ./deploy.sh $FLAVOR_CONF echo echo "--------------------------------------------------------" @@ -483,16 +432,13 @@ echo # source the opnfv.properties to get ARTIFACT_VERSION - source $WORKSPACE/opnfv.properties - - scp $WORKSPACE/compass.iso $INTERNAL_REPO/ - scp $WORKSPACE/opnfv.properties $INTERNAL_REPO/ - scp $WORKSPACE/compass.iso $INTERNAL_REPO/opnfv-$OPNFV_ARTIFACT_VERSION.iso + source $BUILD_DIRECTORY/opnfv.properties # upload artifact and additional files to google storage - gsutil cp $WORKSPACE/compass.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 - gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 - gsutil cp $WORKSPACE/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 + gsutil cp $BUILD_DIRECTORY/compass.iso gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.iso > gsutil.iso.log 2>&1 + gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/opnfv-$OPNFV_ARTIFACT_VERSION.properties > gsutil.properties.log 2>&1 + gsutil cp $BUILD_DIRECTORY/opnfv.properties gs://$GS_URL/latest.properties > gsutil.latest.log 2>&1 + echo echo "--------------------------------------------------------" diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index 3a7b09e09..9e3ff5196 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -582,6 +582,11 @@ mkdir -p $HOME/functest/ # source openstack vars + if [ ! -f $HOME/opnfv-openrc.sh ]; then + echo "Credentials file not found in "$HOME/opnfv-openrc.sh + exit 1 + fi + echo "Sourcing the OpenStack credentials in"$HOME/opnfv-openrc.sh source $HOME/opnfv-openrc.sh # WORKSPACE is the root of the functest repo @@ -591,6 +596,10 @@ # prepare echo "Functest: prepare Functest environment" python $WORKSPACE/testcases/config_functest.py --debug $WORKSPACE/ start + if [ $? != 0 ]; then + echo "Error when configuring Functest environment" + exit 1 + fi # vPing echo "Functest: run vPing" diff --git a/jjb/genesis/genesis-foreman.yml b/jjb/genesis/genesis-foreman.yml index e447880d7..a7fdabf26 100644 --- a/jjb/genesis/genesis-foreman.yml +++ b/jjb/genesis/genesis-foreman.yml @@ -629,6 +629,9 @@ # cleanup first sudo $WORKSPACE/common/ci/clean.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml + echo "Sleeping for 60 seconds between clean and deploy to allow nodes to power off" + sleep 60 + # and then initiate deployment sudo $WORKSPACE/$INSTALLER/ci/deploy.sh -base_config $WORKSPACE/$INSTALLER/ci/inventory/lf_pod2_ksgen_settings.yml diff --git a/jjb/genesis/genesis-fuel.yml b/jjb/genesis/genesis-fuel.yml index 97a608866..405fbc0ad 100644 --- a/jjb/genesis/genesis-fuel.yml +++ b/jjb/genesis/genesis-fuel.yml @@ -336,6 +336,10 @@ - 'fuel-upload-artifact' - 'fuel-workspace-cleanup' + publishers: + - email: + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com + - job-template: name: 'genesis-fuel-deploy-{stream}' @@ -372,6 +376,10 @@ - 'fuel-download-artifact' - 'fuel-deploy' + publishers: + - email: + recipients: jonas.bjurel@ericsson.com stefan.k.berg@ericsson.com + - job-template: name: 'genesis-fuel-lab-reconfig-{stream}' @@ -539,7 +547,7 @@ chmod a+x $TMPDIR # set CONFDIR, BRIDGE - export CONFDIR=$WORKSPACE/fuel/deploy/baremetal/conf/linux_foundation_lab/pod2/ha + export CONFDIR=$WORKSPACE/fuel/deploy/templates/hardware_environment/old_conf/linux_foundation_lab/pod2/ha export BRIDGE=pxebr # cleanup first @@ -555,8 +563,8 @@ # start the deployment echo "Issuing command" - echo "sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso $CONFDIR/dea.yaml $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE" - sudo $WORKSPACE/fuel/ci/deploy.sh $WORKSPACE/opnfv.iso $CONFDIR/dea.yaml $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE + echo "sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE" + sudo $WORKSPACE/fuel/ci/deploy.sh -iso $WORKSPACE/opnfv.iso -dea $CONFDIR/dea.yaml -dha $CONFDIR/dha.yaml -s $TMPDIR -b $BRIDGE echo echo "--------------------------------------------------------" diff --git a/jjb/releng/releng.yml b/jjb/opnfv/opnfv-docs.yml index 87a73c490..4ed6bdeb1 100644 --- a/jjb/releng/releng.yml +++ b/jjb/opnfv/opnfv-docs.yml @@ -1,15 +1,15 @@ ######################## -# Job configuration for releng +# Job configuration for opnfv-docs ######################## - project: - name: releng + name: opnfv-docs - project: 'releng' + project: opnfv-docs jobs: - - 'releng-verify' - - 'releng-merge' + - 'opnfv-docs-verify' + - 'opnfv-docs-merge' # stream: branch with - in place of / (eg. stable-arno) # branch: branch (eg. stable/arno) @@ -22,7 +22,7 @@ ######################## - job-template: - name: 'releng-verify' + name: 'opnfv-docs-verify' node: master @@ -36,7 +36,7 @@ parameters: - project-parameter: - project: '{project}' + project: $GERRIT_PROJECT - gerrit-parameter: branch: 'master' @@ -63,31 +63,22 @@ - comment-added-contains-event: comment-contains-value: 'reverify' projects: - - project-compare-type: 'ANT' - project-pattern: '{project}' + - project-compare-type: 'REG_EXP' +#Left out arno projects oscar|octopus|functest|genesis|pharos|opnfvdocs + project-pattern: 'vswitchperf|yardstick|apex|availability|bottlenecks|compass4nfv|conductor|copper|doctor|dovetail|dpacc|escalator|fastpathmetrics|fuel|inspector|ipv6|joid|kvmfornfv|lsoapi|moon|movie|multisite|onosfw|ovsnfv|parser|prediction|promise|qtip|releng|rs|sfc|vnf_forwarding_graph' branches: - branch-compare-type: 'ANT' branch-pattern: '**/master' file-paths: - compare-type: ANT - pattern: 'utils/**' - - compare-type: ANT pattern: 'docs/**' - forbidden-file-paths: - - compare-type: ANT - pattern: 'jjb/**' builders: - - shell: - !include-raw docu-build-new.sh - + - shell: + !include-raw ../../utils/docu-build-new.sh - job-template: - name: 'releng-merge' - - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB + name: 'opnfv-docs-merge' node: master @@ -95,21 +86,21 @@ logrotate: daysToKeep: 30 - numToKeep: 40 + numToKeep: 10 artifactDaysToKeep: -1 - artifactNumToKeep: 5 + artifactNumToKeep: -1 parameters: - project-parameter: - project: '{project}' + project: $GERRIT_PROJECT - gerrit-parameter: branch: 'master' scm: - gerrit-trigger-scm: credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' wrappers: - ssh-agent-credentials: @@ -122,20 +113,15 @@ - comment-added-contains-event: comment-contains-value: 'remerge' projects: - - project-compare-type: 'ANT' + - project-compare-type: 'REG_EXP' project-pattern: 'releng' branches: - branch-compare-type: 'ANT' branch-pattern: '**/master' file-paths: - compare-type: ANT - pattern: 'utils/**' - - compare-type: ANT pattern: 'docs/**' - forbidden-file-paths: - - compare-type: ANT - pattern: 'jjb/**' builders: - - shell: - !include-raw docu-build-new.sh + - shell: + !include-raw ../../utils/docu-build-new.sh diff --git a/jjb/releng-jobs.yaml b/jjb/releng-jobs.yaml index b02853398..d732b1fab 100644 --- a/jjb/releng-jobs.yaml +++ b/jjb/releng-jobs.yaml @@ -57,9 +57,9 @@ pattern: jjb/** - compare-type: ANT pattern: jjb-templates/** - forbidden-file-paths: - compare-type: ANT pattern: utils/** + forbidden-file-paths: - compare-type: ANT pattern: docs/** @@ -116,9 +116,9 @@ file-paths: - compare-type: ANT pattern: jjb/** - forbidden-file-paths: - compare-type: ANT pattern: utils/** + forbidden-file-paths: - compare-type: ANT pattern: docs/** diff --git a/jjb/releng/docu-build-new.sh b/jjb/releng/docu-build-new.sh deleted file mode 100755 index 00d046479..000000000 --- a/jjb/releng/docu-build-new.sh +++ /dev/null @@ -1,109 +0,0 @@ -#!/bin/bash -set -e -set -o pipefail - -export PATH=$PATH:/usr/local/bin/ -git_sha1="$(git rev-parse HEAD)" - -clean() {{ -if [[ -d docs/output ]]; then -rm -rf docs/output -echo "cleaning up output directory" -fi -}} - -trap clean EXIT TERM INT SIGTERM SIGHUP - -#set git_sha1 -files=() -while read -r -d ''; do - files+=("$REPLY") -done < <(find docs/ -type f -iname '*.rst' -print0) -for file in "${{files[@]}}"; do - sed -i "s/_sha1_/$git_sha1/g" $file -done - -directories=() -while read -d $'\n'; do - directories+=("$REPLY") -done < <(find docs/ -name 'index.rst' -printf '%h\n' | sort -u ) - -for dir in "${{directories[@]}}"; do - echo - echo "#############################" - echo "Building DOCS in ${{dir##*/}}" - echo "#############################" - echo - - if [[ ! -d docs/output/"${{dir##*/}}/" ]]; then - mkdir -p docs/output/"${{dir##*/}}/" - fi - - sphinx-build -b html -E -c docs/etc/ ""$dir"/" docs/output/"${{dir##*/}}/" - -done - -# NOTE: make sure source parameters for GS paths are not empty. -[[ $GERRIT_CHANGE_NUMBER =~ .+ ]] -[[ $GERRIT_PROJECT =~ .+ ]] -[[ $GERRIT_BRANCH =~ .+ ]] - -gs_path_review="artifacts.opnfv.org/review/$GERRIT_CHANGE_NUMBER" - -if [[ $GERRIT_BRANCH = "master" ]] ; then - gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT" -else - gs_path_branch="artifacts.opnfv.org/$GERRIT_PROJECT/${{GERRIT_BRANCH##*/}}" -fi - -for dir in "${{directories[@]}}"; do - echo - echo "#############################" - echo "UPLOADING DOCS in ${{dir##*/}}" - echo "#############################" - echo - - - if [[ $JOB_NAME =~ "verify" ]] ; then - - #upload artifacts for verify job - gsutil cp -r docs/output/"${{dir##*/}}/" "gs://$gs_path_review/" - - # post link to gerrit as comment - gerrit_comment="$(echo '"Document is available at 'http://$gs_path_review/"${{dir##*/}}"/index.html' for review"')" - echo "$gerrit_comment" - ssh -p 29418 gerrit.opnfv.org gerrit review -p $GERRIT_PROJECT -m \ - "$gerrit_comment" $GERRIT_PATCHSET_REVISION - - #set cache to 0 - for x in $(gsutil ls gs://$gs_path_review/"${{dir##*/}}" | grep html); - do - gsutil setmeta -h "Content-Type:text/html" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - "$x" - done - - else - - #upload artifacts for merge job - gsutil cp -r docs/output/"${{dir##*/}}" "gs://$gs_path_branch/docs/" - echo "Latest document is available at http://$gs_path_branch/docs/"${{dir##*/}}"/index.html" - - #set cache to 0 - for x in $(gsutil ls gs://$gs_path_branch/"${{dir}}" | grep html); - do - gsutil setmeta -h "Content-Type:text/html" \ - -h "Cache-Control:private, max-age=0, no-transform" \ - "$x" - done - - #Clean up review when merging - if gsutil ls "gs://$gs_path_review" > /dev/null 2>&1 ; then - echo - echo "Deleting Out-of-dated Documents..." - gsutil rm -r "gs://$gs_path_review" - fi - - fi - -done diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index 385099dc7..a9619032f 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -225,8 +225,8 @@ export OS_IMAGE_API_VERSION=1 # Install required packages. - # 'qemu-nbd' is needed when building the yardstick image. - sudo yum -y install qemu-img + # 'libguestfs-tools' is needed when building the yardstick image. + sudo yum -y install libguestfs-tools # set virtualenv echo "Yardstick: setup virtualenv" |