diff options
| -rw-r--r-- | docs/jenkins-job-builder/opnfv-jjb-usage.rst | 179 | ||||
| -rw-r--r-- | jjb/compass4nfv/compass4nfv.yml | 16 | ||||
| -rw-r--r-- | jjb/compass4nfv/opnfv-compass4nfv.yml | 2 | ||||
| -rw-r--r-- | jjb/functest/functest.yml | 12 | ||||
| -rw-r--r-- | jjb/functest/res-build.sh | 6 | ||||
| -rw-r--r-- | jjb/opnfv/installer-params.yml | 2 | ||||
| -rw-r--r-- | jjb/yardstick/yardstick.yml | 2 | ||||
| -rwxr-xr-x | utils/docs-build.sh | 22 |
8 files changed, 79 insertions, 162 deletions
diff --git a/docs/jenkins-job-builder/opnfv-jjb-usage.rst b/docs/jenkins-job-builder/opnfv-jjb-usage.rst index 7daacaffb..6e2b6e2b5 100644 --- a/docs/jenkins-job-builder/opnfv-jjb-usage.rst +++ b/docs/jenkins-job-builder/opnfv-jjb-usage.rst @@ -2,40 +2,50 @@ Creating/Configuring/Verifying Jenkins Jobs =========================================== -Clone the repo:: +Clone and setup the repo:: - git clone ssh://YOU@gerrit.opnfv.org:29418/releng + git clone ssh://YOU@gerrit.opnfv.org:29418/releng + cd releng + git review -s -make changes:: +Make changes:: - git commit -sv - git review - remote: Resolving deltas: 100% (3/3) - remote: Processing changes: new: 1, refs: 1, done - remote: - remote: New Changes: - remote: https://gerrit.opnfv.org/gerrit/51 - remote: - To ssh://agardner@gerrit.opnfv.org:29418/releng.git - * [new branch] HEAD -> refs/publish/master + git commit -sv + git review + remote: Resolving deltas: 100% (3/3) + remote: Processing changes: new: 1, refs: 1, done + remote: + remote: New Changes: + remote: https://gerrit.opnfv.org/gerrit/51 + remote: + To ssh://agardner@gerrit.opnfv.org:29418/releng.git + * [new branch] HEAD -> refs/publish/master -Follow the link to gerrit https://gerrit.opnfv.org/gerrit/51 in a few moments the verify job will have completed and you will see Verified +1 jenkins-ci in the gerrit ui. +Follow the link to gerrit https://gerrit.opnfv.org/gerrit/51 in a few moments +the verify job will have completed and you will see Verified +1 jenkins-ci in +the gerrit ui. -If the changes pass the verify job https://build.opnfv.org/ci/view/builder/job/builder-verify-jjb/ The patch can be submitited by a committer. +If the changes pass the verify job +https://build.opnfv.org/ci/view/builder/job/builder-verify-jjb/ , +the patch can be submitited by a committer. Job Types * Verify Job - * Trigger: **recheck** or **reverify** + * Trigger: **recheck** or **reverify** * Merge Job - * Trigger: **remerge** + * Trigger: **remerge** -The verify and merge jobs are retriggerable in Gerrit by simply leaving a comment with one of the keywords listed above. This is useful in case you need to re-run one of those jobs in case if build issues or something changed with the environment. +The verify and merge jobs are retriggerable in Gerrit by simply leaving +a comment with one of the keywords listed above. +This is useful in case you need to re-run one of those jobs in case +if build issues or something changed with the environment. -You can add below persons as reviewers to your patch in order to get it reviewed and submitted. +You can add below persons as reviewers to your patch in order to get it +reviewed and submitted. * fatih.degirmenci@ericsson.com * agardner@linuxfoundation.org @@ -50,129 +60,8 @@ You can add below persons as reviewers to your patch in order to get it reviewed Or just email a request for submission to opnfv-helpdesk@rt.linuxfoundation.org -The Current merge and verify jobs for jenkins job builder as pulled from the repo:: - -**releng-jobs.yaml**: - -.. code-block:: bash - - - project: - name: builder-jobs - jobs: - - 'builder-verify-jjb' - - 'builder-merge' - - project: 'releng' - - - job-template: - name: builder-verify-jjb - - node: master - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: -1 - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '$GERRIT_REFSPEC' - choosing-strategy: 'gerrit' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - triggers: - - gerrit: - trigger-on: - - patchset-created-event: - exclude-drafts: 'false' - exclude-trivial-rebase: 'false' - exclude-no-code-change: 'false' - - draft-published-event - - comment-added-contains-event: - comment-contains-value: 'recheck' - - comment-added-contains-event: - comment-contains-value: 'reverify' - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - file-paths: - - compare-type: ANT - pattern: jjb/** - - compare-type: ANT - pattern: jjb-templates/** - - - builders: - - shell: - !include-raw verify-releng - - - job-template: - name: 'builder-merge' - - node: master - - # builder-merge job to run JJB update - # - # This job's purpose is to update all the JJB - - project-type: freestyle - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - - parameters: - - project-parameter: - project: '{project}' - - gerrit-parameter: - branch: 'master' - - scm: - - gerrit-trigger-scm: - credentials-id: '{ssh-credentials}' - refspec: '' - choosing-strategy: 'default' - - wrappers: - - ssh-agent-credentials: - user: '{ssh-credentials}' - - triggers: - - gerrit: - trigger-on: - - change-merged-event - - comment-added-contains-event: - comment-contains-value: 'remerge' - projects: - - project-compare-type: 'ANT' - project-pattern: 'releng' - branches: - - branch-compare-type: 'ANT' - branch-pattern: '**/master' - file-paths: - - compare-type: ANT - pattern: jjb/** - - builders: - - shell: | - source /opt/virtualenv/jenkins-job-builder/bin/activate - cd /opt/jenkins-ci/releng - git pull - jenkins-jobs update --delete-old jjb/ +The Current merge and verify jobs for jenkins job builder can be found +in `releng-jobs.yaml`_. + +.. _releng-jobs.yaml: + https://gerrit.opnfv.org/gerrit/gitweb?p=releng.git;a=blob;f=jjb/releng-jobs.yaml; diff --git a/jjb/compass4nfv/compass4nfv.yml b/jjb/compass4nfv/compass4nfv.yml index 40402011c..1a0a6f746 100644 --- a/jjb/compass4nfv/compass4nfv.yml +++ b/jjb/compass4nfv/compass4nfv.yml @@ -7,8 +7,8 @@ jobs: - 'compass-verify-{stream}' - 'compass-daily-{stream}' - - 'compass-build-iso' - - 'compass-build-ppa' + - 'compass-build-iso-{stream}' + - 'compass-build-ppa-{stream}' - 'compass-deploy-virtual-{flavor}' - 'compass-deploy-bare-huawei-us' @@ -56,7 +56,7 @@ - project-parameter: project: '{project}' - gerrit-parameter: - branch: 'master' + branch: '{branch}' - compass-parameter: installer: '{installer}' - string: @@ -86,7 +86,7 @@ project-pattern: '{project}' branches: - branch-compare-type: 'ANT' - branch-pattern: '**/master' + branch-pattern: '**/{branch}' forbidden-file-paths: - compare-type: ANT pattern: 'docs/**|.gitignore' @@ -147,7 +147,7 @@ block: true - job-template: - name: 'compass-build-iso' + name: 'compass-build-iso-{stream}' node: ericsson-build @@ -169,7 +169,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'master' + branch: '{branch}' builders: - 'builder-compass-build-iso' @@ -177,7 +177,7 @@ - 'builder-compass-workspace-cleanup' - job-template: - name: 'compass-build-ppa' + name: 'compass-build-ppa-{stream}' description: "build ppa(using docker) in huawei lab" @@ -201,7 +201,7 @@ - git-scm: credentials-id: '{ssh-credentials}' refspec: '' - branch: 'master' + branch: '{branch}' triggers: - timed: 'H 16 * * *' diff --git a/jjb/compass4nfv/opnfv-compass4nfv.yml b/jjb/compass4nfv/opnfv-compass4nfv.yml index bebcf1f99..c647abcf8 100644 --- a/jjb/compass4nfv/opnfv-compass4nfv.yml +++ b/jjb/compass4nfv/opnfv-compass4nfv.yml @@ -5,7 +5,7 @@ name: 'opnfv-compass4nfv' - installer: 'compass4nfv' + installer: 'compass' controller: - 'odl' diff --git a/jjb/functest/functest.yml b/jjb/functest/functest.yml index c77a1fac9..e1dff72e4 100644 --- a/jjb/functest/functest.yml +++ b/jjb/functest/functest.yml @@ -16,7 +16,7 @@ - orange-pod2: installer: joid - huawei-us-deploy-bare-1: - installer: compass4nfv + installer: compass - intel-pod5: installer: joid @@ -152,7 +152,7 @@ - 'functest-cleanup' - 'set-functest-env' - 'functest-all' -# - 'functest-store-results' + - 'functest-store-results' - builder: name: functest-suite-builder @@ -204,8 +204,14 @@ labconfig="-v ${LAB_CONFIG}:/home/opnfv/functest/conf/openstack.creds" fi + dir_result="${HOME}/opnfv/functest/reports" + mkdir -f ${dir_result} + rm -rf ${dir_result}/* + + $res_volume="-v ${dir_result}:/home/opnfv/functest/results" + docker pull opnfv/functest:latest_stable - cmd="docker run -id -e $envs ${labconfig} ${sshkey} opnfv/functest:latest_stable /bin/bash" + cmd="docker run -id -e $envs ${labconfig} ${sshkey} ${res_volume} opnfv/functest:latest_stable /bin/bash" echo "Functest: Running docker run command: ${cmd}" ${cmd} docker ps -a diff --git a/jjb/functest/res-build.sh b/jjb/functest/res-build.sh index a9c5dbe1b..9d425773d 100644 --- a/jjb/functest/res-build.sh +++ b/jjb/functest/res-build.sh @@ -7,9 +7,9 @@ export PATH=$PATH:/usr/local/bin/ git_sha1="$(git rev-parse HEAD)" res_build_date=$(date -u +"%Y-%m-%d_%H-%M-%S") -# Result directory in the docker file +# Result directory in the jumphost # to be used only with CI -dir_result="/home/opnfv/functest/results" +dir_result="${HOME}/opnfv/functest/reports" # Clean the results directory # remove json file for rally, export only html @@ -20,7 +20,7 @@ rm -f $dir_result/rally/*.json # date is generated by functest so on the artifact, the results shall be under functest/<testbed id>/date/ testbed=$NODE_NAME -project_artifact=functest/$testbed/$res_build_date +project_artifact=logs/functest/$testbed/$res_build_date # copy folder to artifact if [ -d "$dir_result" ]; then diff --git a/jjb/opnfv/installer-params.yml b/jjb/opnfv/installer-params.yml index 26feee43d..956e67da8 100644 --- a/jjb/opnfv/installer-params.yml +++ b/jjb/opnfv/installer-params.yml @@ -19,7 +19,7 @@ description: 'Controller name' - parameter: - name: 'compass4nfv-defaults' + name: 'compass-defaults' parameters: - string: name: INSTALLER_IP diff --git a/jjb/yardstick/yardstick.yml b/jjb/yardstick/yardstick.yml index 4c4997731..e5c306a56 100644 --- a/jjb/yardstick/yardstick.yml +++ b/jjb/yardstick/yardstick.yml @@ -9,7 +9,7 @@ - ericsson-pod1: installer: fuel - huawei-us-deploy-bare-1: - installer: compass4nfv + installer: compass loop: - daily diff --git a/utils/docs-build.sh b/utils/docs-build.sh index bf9ab5b1e..5ac8b2be6 100755 --- a/utils/docs-build.sh +++ b/utils/docs-build.sh @@ -38,6 +38,26 @@ html_notes="\n Revision: $rev_full\n\n Build date: |today|" default_conf='releng/docs/etc/conf.py' opnfv_logo='releng/docs/etc/opnfv-logo.png' +function check_rst_doc() { + _src="$1" + + if ! which doc8 > /dev/null ; then + echo "Error: 'doc8' not found. Exec 'sudo pip install doc8' first." + exit 1 + fi + # Note: This check may fail in many jobs for building project docs, since + # the old sample has lines more than 120. We ignore failures on this + # check right now, but these have to be fixed before OPNFV B release. + _out=$(doc8 --max-line-length 120 "$_src") || { + _msg='Error: rst validatino (doc8) has failed, please fix the following error(s).' + _errs=$(echo "$_out" | sed -n -e "/^$_src/s/^/ /p") + echo + echo -e "$_msg\n$_errs" + echo + [[ -n "$GERRIT_COMMENT" ]] && echo -e "$_msg\n$_errs" >> "$GERRIT_COMMENT" + } +} + function add_html_notes() { _src="$1" _dir="$2" @@ -65,6 +85,8 @@ function add_config() { } +check_rst_doc $SRC_DIR + if [[ ! -d "$RELENG_DIR" ]] ; then echo "Error: $RELENG_DIR dir not found. See https://wiki.opnfv.org/documentation/tools ." exit 1 |