From: Ed Kern Date: Thu, 19 Apr 2018 19:14:54 +0000 (-0600) Subject: VPP: Dropped opensuse423 on master for osleap15 X-Git-Url: https://gerrit.fd.io/r/gitweb?a=commitdiff_plain;h=7ffc806c508d6202bba6cb75b8fee5dd236e52c3;p=ci-management.git VPP: Dropped opensuse423 on master for osleap15 We are rolling opensuse releases deprecating opensuse leap423 in favor of leap15. Have to explictily callout old and new into different projects. Pulled all opensuse to a new vpp-opensuse.yaml Change-Id: If55dfdba1d10159252b3fcfb3e63d2a587f4f32b Signed-off-by: Ed Kern --- diff --git a/jjb/vpp/vpp-opensuse.yaml b/jjb/vpp/vpp-opensuse.yaml new file mode 100644 index 000000000..7e266e2f7 --- /dev/null +++ b/jjb/vpp/vpp-opensuse.yaml @@ -0,0 +1,337 @@ +- project: + name: opensuse423 + jobs: + - 'vpp-verify-{stream}-opensuse' + - 'vpp-merge-{stream}-opensuse' + + project: 'vpp' + os: + - opensuse: + repo-os-part: 'opensuse' + + stream: + - '1801': + branch: 'stable/1801' + repo-stream-part: 'stable.1801' + - '1804': + branch: 'stable/1804' + repo-stream-part: 'stable.1804' + +- project: + name: osleap15 + jobs: + - 'vpp-verify-{stream}-osleap15' + - 'vpp-merge-{stream}-osleap15' + + project: 'vpp' + os: + - opensuse: + repo-os-part: 'opensuse' + stream: + - master: + branch: 'master' + repo-stream-part: 'master' + +- job-template: + name: 'vpp-verify-{stream}-opensuse' + + project-type: freestyle + node: 'opensuse-us' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'opensuse' + - repo-name-parameter: + repo-name: '{repo-stream-part}.opensuse' + + 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-trivial-patch-submitted: + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh + publishers: + - archive: + artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 2 + fixed-delay: 90 + +- job-template: + name: 'vpp-verify-{stream}-osleap15' + + project-type: freestyle + node: 'osleap15-us' + concurrent: true + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'opensuse' + - repo-name-parameter: + repo-name: '{repo-stream-part}.opensuse' + + 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-trivial-patch-submitted: + name: '{project}' + branch: '{branch}' + + builders: + - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh + publishers: + - archive: + artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + archive-artifacts: '/tmp/vpp-failed-unittests/*/* **/core' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 2 + fixed-delay: 90 + +- job-template: + name: 'vpp-merge-{stream}-opensuse' + + project-type: freestyle + node: 'opensuse-us' + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'opensuse' + - maven-project-parameter: + maven: 'mvn33-new' + - maven-exec: + maven-version: 'mvn33-new' + - stream-parameter: + stream: '{stream}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.opensuse' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' + + builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/home/jenkins' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/home/jenkins' + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - shell: + !include-raw-escape: include-raw-vpp-checkstyle.sh + - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh + - provide-maven-settings: + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + + publishers: + - archive: + artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 + +- job-template: + name: 'vpp-merge-{stream}-osleap15' + + project-type: freestyle + node: 'osleap15-us' + + logrotate: + daysToKeep: '{build-days-to-keep}' + numToKeep: 100 + artifactDaysToKeep: '{build-artifact-days-to-keep}' + artifactNumToKeep: '{build-artifact-num-to-keep}' + + parameters: + - project-parameter: + project: '{project}' + - gerrit-parameter: + branch: '{branch}' + - os-parameter: + os: 'opensuse' + - maven-project-parameter: + maven: 'mvn33-new' + - maven-exec: + maven-version: 'mvn33-new' + - stream-parameter: + stream: '{stream}' + - repo-name-parameter: + repo-name: '{repo-stream-part}.opensuse' + + scm: + - gerrit-trigger-scm: + credentials-id: 'jenkins-gerrit-credentials' + refspec: '' + choosing-strategy: 'default' + + wrappers: + - fdio-infra-wrappers: + build-timeout: '{build-timeout}' + + triggers: + - gerrit-trigger-patch-merged: + name: '{project}' + branch: '{branch}' + + builders: + - config-file-provider: + files: + - file-id: '.packagecloud' + target: '/home/jenkins' + - config-file-provider: + files: + - file-id: 'packagecloud_api' + target: '/home/jenkins' + - maven-target: + maven-version: 'mvn33-new' + goals: '--version' + settings: 'vpp-settings' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp + - shell: + !include-raw-escape: include-raw-vpp-checkstyle.sh + - shell: + !include-raw-escape: ../scripts/setup_vpp_ubuntu_docker_test.sh + - shell: + !include-raw-escape: + - ../scripts/setup_vpp_dpdk_dev_env.sh + - include-raw-vpp-build.sh + - provide-maven-settings: + settings-file: 'vpp-settings' + global-settings-file: 'global-settings' + - shell: + !include-raw-escape: + - ../scripts/maven_push_functions.sh + - include-raw-vpp-maven-push.sh + - shell: + !include-raw-escape: + - ../scripts/packagecloud_push.sh + + publishers: + - archive: + artifacts: 'build-root/*.rpm,build-root/*.deb,dpdk/*.rpm,dpdk/*.deb' + allow-empty: 'true' + fingerprint: false + only-if-success: true + default-excludes: false + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - naginator: + rerun-unstable-builds: false + max-failed-builds: 1 + fixed-delay: 90 diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index c5272681b..9a799550d 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -15,8 +15,6 @@ repo-os-part: 'ubuntu.xenial.main' - centos7: repo-os-part: 'centos7' - - opensuse: - repo-os-part: 'opensuse' stream: - master: @@ -82,8 +80,6 @@ os: - ubuntu1804: repo-os-part: 'ubuntu.bionic.main' - - osleap15: - repo-os-part: 'osleap15' - project: name: vpp-arm @@ -401,6 +397,8 @@ max-failed-builds: 1 fixed-delay: 90 + + - job-template: name: 'vpp-verify-{stream}-{os}'