diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/csit/csit.yaml | 3 | ||||
| -rw-r--r-- | jjb/deb_dpdk/include-raw-deb_dpdk-build.sh | 3 | ||||
| -rw-r--r-- | jjb/honeycomb/honeycomb.yaml | 10 | ||||
| -rw-r--r-- | jjb/vpp/vpp.yaml | 5 |
4 files changed, 12 insertions, 9 deletions
diff --git a/jjb/csit/csit.yaml b/jjb/csit/csit.yaml index e0fb835bb..c9a0d58e4 100644 --- a/jjb/csit/csit.yaml +++ b/jjb/csit/csit.yaml @@ -20,9 +20,6 @@ - master: branch: 'master' branch-id: 'oper' - - '1609': - branch: 'rls1609' - branch-id: 'oper-rls1609' stream: - master: branch: 'master' diff --git a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh index 965ebcc8c..e81267a1f 100644 --- a/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh +++ b/jjb/deb_dpdk/include-raw-deb_dpdk-build.sh @@ -23,7 +23,8 @@ sha1sum $0 MISSING_PKGS=$(dpkg-checkbuilddeps |& perl -pe 's/^.+://g; s/\(.*?\)//g') -sudo apt-get install -y ${MISSING_PKGS} devscripts +sudo apt-get update +sudo apt-get install -y ${MISSING_PKGS} devscripts pristine-tar pkg_version=$(dpkg-parsechangelog --show-field Version) orig_version=$(echo ${pkg_version} | sed s'/-.*//') diff --git a/jjb/honeycomb/honeycomb.yaml b/jjb/honeycomb/honeycomb.yaml index ccb9f3fef..d59e19521 100644 --- a/jjb/honeycomb/honeycomb.yaml +++ b/jjb/honeycomb/honeycomb.yaml @@ -29,6 +29,7 @@ project-type: maven node: verify-{os} concurrent: true + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@ -84,6 +85,7 @@ project-type: maven node: 'verify-image-{os}' concurrent: true + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@ -151,6 +153,7 @@ name: 'honeycomb-merge-{stream}-{os}' project-type: maven node: merge-{os} + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' @@ -186,10 +189,6 @@ name: 'honeycomb' branch: '{branch}' - prebuilders: - - shell: | - if [ "${{OS}}" == "ubuntu1404" ];then sudo update-java-alternatives -s /usr/lib/jvm/java-1.8.0-openjdk-amd64||echo 'ignoring failure';fi - maven: maven-name: '{mvn33}' root-pom: 'pom.xml' @@ -205,7 +204,7 @@ publishers: - sonar: - jdk: 'openjdk8' + jdk: 'openjdk8-{os}' language: 'java' branch: '{stream}' - email-notification: @@ -215,6 +214,7 @@ name: 'honeycomb-integration-{stream}-{os}' project-type: maven node: merge-{os} + jdk: openjdk8-{os} logrotate: daysToKeep: '{build-days-to-keep}' diff --git a/jjb/vpp/vpp.yaml b/jjb/vpp/vpp.yaml index 3088e9e96..36b97a66c 100644 --- a/jjb/vpp/vpp.yaml +++ b/jjb/vpp/vpp.yaml @@ -86,6 +86,7 @@ choosing-strategy: 'gerrit' wrappers: + - timestamps - ssh-agent-credentials: users: - '{ssh-credentials}' @@ -138,6 +139,7 @@ choosing-strategy: 'gerrit' wrappers: + - timestamps - ssh-agent-credentials: users: - '{ssh-credentials}' @@ -199,6 +201,7 @@ choosing-strategy: 'default' wrappers: + - timestamps - ssh-agent-credentials: users: - '{ssh-credentials}' @@ -387,6 +390,7 @@ choosing-strategy: 'gerrit' wrappers: + - timestamps - ssh-agent-credentials: users: - '{ssh-credentials}' @@ -447,6 +451,7 @@ choosing-strategy: 'default' wrappers: + - timestamps - ssh-agent-credentials: users: - '{ssh-credentials}' |