Merge "removing the Master flag from the apex build, Liberty is stable"
authorTim Rozet <trozet@redhat.com>
Tue, 15 Dec 2015 15:07:01 +0000 (15:07 +0000)
committerGerrit Code Review <gerrit@172.30.200.206>
Tue, 15 Dec 2015 15:07:01 +0000 (15:07 +0000)
docs/jenkins-job-builder/opnfv-jjb-usage.rst
jjb/compass4nfv/compass4nfv.yml
jjb/compass4nfv/opnfv-compass4nfv.yml
jjb/functest/functest.yml
jjb/functest/res-build.sh
jjb/opnfv/installer-params.yml
jjb/yardstick/yardstick.yml
utils/docs-build.sh

index 7daacaf..6e2b6e2 100644 (file)
@@ -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;
index 4040201..1a0a6f7 100644 (file)
@@ -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'
             block: true
 
 - job-template:
-    name: 'compass-build-iso'
+    name: 'compass-build-iso-{stream}'
 
     node: ericsson-build
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     builders:
         - 'builder-compass-build-iso'
         - 'builder-compass-workspace-cleanup'
 
 - job-template:
-    name: 'compass-build-ppa'
+    name: 'compass-build-ppa-{stream}'
 
     description: "build ppa(using docker) in huawei lab"
 
         - git-scm:
             credentials-id: '{ssh-credentials}'
             refspec: ''
-            branch: 'master'
+            branch: '{branch}'
 
     triggers:
         - timed: 'H 16 * * *'
index bebcf1f..c647abc 100644 (file)
@@ -5,7 +5,7 @@
 
     name: 'opnfv-compass4nfv'
 
-    installer: 'compass4nfv'
+    installer: 'compass'
 
     controller:
         - 'odl'
index c77a1fa..e1dff72 100644 (file)
@@ -16,7 +16,7 @@
         - orange-pod2:
             installer: joid
         - huawei-us-deploy-bare-1:
-            installer: compass4nfv
+            installer: compass
         - intel-pod5:
             installer: joid
 
         - 'functest-cleanup'
         - 'set-functest-env'
         - 'functest-all'
-#        - 'functest-store-results'
+        - 'functest-store-results'
 
 - builder:
     name: functest-suite-builder
                 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
index a9c5dbe..9d42577 100644 (file)
@@ -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
index 26feee4..956e67d 100644 (file)
@@ -19,7 +19,7 @@
             description: 'Controller name'
 
 - parameter:
-    name: 'compass4nfv-defaults'
+    name: 'compass-defaults'
     parameters:
         - string:
             name: INSTALLER_IP
index 4c49977..e5c306a 100644 (file)
@@ -9,7 +9,7 @@
         - ericsson-pod1:
             installer: fuel
         - huawei-us-deploy-bare-1:
-            installer: compass4nfv
+            installer: compass
 
     loop:
         - daily
index bf9ab5b..5ac8b2b 100755 (executable)
@@ -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