From: Vanessa Rene Valderrama Date: Fri, 16 Dec 2016 14:42:55 +0000 (+0000) Subject: Merge "CSIT-474: CSIT documentation auto generation" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=2a36c43a61bf8698491db42031121d0ef5d6f31f;hp=0b5daf17cbbefee675462aa9af1c3004054f61a8;p=ci-management.git Merge "CSIT-474: CSIT documentation auto generation" --- diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index cb2a9e181..4354bb00f 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -8,6 +8,8 @@ - 'csit-vpp-verify-{stream_timed}-weekly' - 'csit-vpp-verify-{stream_timed}-semiweekly' - 'csit-vpp-verify-perf-master-nightly-all' + - 'csit-docs-merge-{stream}' + - 'csit-docs-verify-{stream}' project: 'csit' branch: 'master' @@ -31,6 +33,7 @@ branch: 'rls1609' branch-id: 'oper-rls1609' + - job-template: name: 'csit-vpp-functional-{stream}-virl' @@ -77,6 +80,7 @@ - robot-report: output-path: '' + - job-template: name: 'csit-vpp-perf-{stream}-{type}' @@ -260,6 +264,7 @@ xpath-type: 'nodeset' xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]' + - job-template: name: 'csit-vpp-verify-{stream_timed}-weekly' description: 'Purpose of this job is to validate CSIT code of corresponding branch against verified vpp build from corresponding branch and create corresponding operational branch in case of success.' @@ -366,6 +371,7 @@ - robot-report: output-path: 'csit/archive' + - job-template: name: 'csit-vpp-verify-perf-master-nightly-all' description: 'Purpose of this job is to validate latest vpp build from corresponding branch stored in nexus against verified CSIT codebase of corresponding branch.' @@ -542,6 +548,134 @@ xpath-type: 'nodeset' xpath: '//*[@framesize="78" and contains(@tags,"PDR") and @workerthreads="4"]' + +- job-template: + name: 'csit-docs-verify-{stream}' + + project-type: freestyle + node: 'verify-ubuntu1604' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 360 + + triggers: + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' + + builders: + - maven-target: + maven-version: 'mvn33' + goals: '--version' + settings: 'csit-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - provide-maven-settings: + settings-file: 'csit-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: include-raw-csit-docs.sh + + publishers: + - archive: + artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + + +- job-template: + name: 'csit-docs-merge-{stream}' + + project-type: freestyle + node: 'verify-ubuntu1604' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: '{build-num-to-keep}' + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + - fdio-infra-wrappers-non-activity-timeout: + build-timeout: 360 + + triggers: + - reverse: + jobs: 'csit-vpp-verify-master-weekly' + result: 'success' + - gerrit: + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'run-docs' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + + builders: + - maven-target: + maven-version: 'mvn33' + goals: '--version' + settings: 'csit-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - provide-maven-settings: + settings-file: 'csit-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: include-raw-csit-docs.sh + + publishers: + - archive: + artifacts: 'resources/tools/doc_gen/csit.docs.tar.gz' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + + - parameter: name: test-type-parameter parameters: diff --git a/jjb/csit/include-raw-csit-docs.sh b/jjb/csit/include-raw-csit-docs.sh new file mode 100644 index 000000000..789af1598 --- /dev/null +++ b/jjb/csit/include-raw-csit-docs.sh @@ -0,0 +1,59 @@ +#!/bin/bash + +set -xe -o pipefail + +[ "$DOCS_REPO_URL" ] || DOCS_REPO_URL="https://nexus.fd.io/content/sites/site" +[ "$PROJECT_PATH" ] || PROJECT_PATH=io/fd/csit +[ "$DOC_FILE" ] || DOC_FILE=csit.docs.tar.gz +[ "$DOC_DIR" ] || DOC_DIR=resources/tools/doc_gen +[ "$SITE_DIR" ] || SITE_DIR=${DOC_DIR}/_build +[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" + +cd ${DOC_DIR} + +chmod +x ./run_doc.sh +./run_doc.sh + +retval=$? +if [ ${retval} -ne "0" ]; then + echo "Documentation generation failed!" +exit ${retval} +fi + +if [[ ${JOB_NAME} == *merge* ]]; then + + cd ${SITE_DIR} + + cat > pom.xml << EOF + + 4.0.0 + io.fd.csit + docs + 1.0.0 + pom + + false + + + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.9 + + + + + + fdio-site + dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${STREAM} + + + +EOF + + ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C + + cd - + +fi