From: Vanessa Rene Valderrama Date: Thu, 2 Feb 2017 19:22:17 +0000 (+0000) Subject: Merge "CSIT-513: Publish vpp make test doc" X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=3ad4671d5de987b580ec8b65215b428595febcc1;hp=20f0e361049c9bd14130880650069d16b2a85dc1;p=ci-management.git Merge "CSIT-513: Publish vpp make test doc" --- diff --git a/jjb/vpp/include-raw-vpp-make-test-docs.sh b/jjb/vpp/include-raw-vpp-make-test-docs.sh new file mode 100644 index 000000000..92325b193 --- /dev/null +++ b/jjb/vpp/include-raw-vpp-make-test-docs.sh @@ -0,0 +1,49 @@ +#!/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/vpp_make_test +[ "$DOC_DIR" ] || DOC_DIR=build-root/test-doc/build/html +[ "$SITE_DIR" ] || SITE_DIR=build-root/docs/deploy-site +[ "$RESOURCES_DIR" ] || RESOURCES_DIR=${SITE_DIR}/src/site/resources +[ "$MVN" ] || MVN="/opt/apache/maven/bin/mvn" +[ "$VERSION" ] || VERSION=$(./build-root/scripts/version rpm-version) + +make test-doc + +if [[ ${JOB_NAME} == *merge* ]]; then + mkdir -p ${RESOURCES_DIR} + mv -f ${DOC_DIR} ${RESOURCES_DIR} + cd ${SITE_DIR} + + cat > pom.xml << EOF + + 4.0.0 + io.fd.vpp + docs + 1.0.0 + pom + + + false + + + + + + org.apache.maven.wagon + wagon-webdav-jackrabbit + 2.9 + + + + + + fdio-site + dav:${DOCS_REPO_URL}/${PROJECT_PATH}/${VERSION} + + + +EOF + ${MVN} site:site site:deploy -gs "${GLOBAL_SETTINGS_FILE}" -s "${SETTINGS_FILE}" -T 4C + cd - +fi \ No newline at end of file diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 406ae3aa3..f8b52caa8 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -6,6 +6,8 @@ - 'vpp-verify-image-{stream}-{os}' - 'vpp-docs-merge-{stream}' - 'vpp-docs-verify-{stream}' + - 'vpp-make-test-docs-merge-{stream}' + - 'vpp-make-test-docs-verify-{stream}' project: 'vpp' os: @@ -505,3 +507,141 @@ default-excludes: false - fdio-infra-shiplogs: maven-version: 'mvn33-new' + +- job-template: + name: 'vpp-make-test-docs-verify-{stream}' + + project-type: freestyle + node: ubuntu1604-basebuild-4c-4g + 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}' + - os-parameter: + os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '$GERRIT_REFSPEC' + choosing-strategy: 'gerrit' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-submitted: + name: '{project}' + branch: '{branch}' + + builders: + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - provide-maven-settings: + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: include-raw-vpp-make-test-docs.sh + publishers: + - archive: + artifacts: 'build-root/test-doc/build/html/*' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + +- job-template: + name: 'vpp-make-test-docs-merge-{stream}' + + project-type: freestyle + node: ubuntu1604-basebuild-4c-4g + 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}' + - os-parameter: + os: 'ubuntu1604' + - maven-exec: + maven-version: 'mvn33-new' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - reverse: + jobs: 'vpp-merge-{stream}-ubuntu1404' + result: 'success' + - gerrit: + server-name: 'Primary' + trigger-on: + - comment-added-contains-event: + comment-contains-value: 'run-docs' + projects: + - project-compare-type: 'ANT' + project-pattern: '{project}' + branches: + - branch-compare-type: 'ANT' + branch-pattern: '**/{branch}' + skip-vote: + successful: true + failed: true + unstable: true + notbuilt: true + + builders: + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - provide-maven-settings: + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: include-raw-vpp-make-test-docs.sh + publishers: + - archive: + artifacts: 'build-root/test-doc/build/html/*' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new'