X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Ftldk%2Ftldk.yaml;h=1b961050231f29796084e8e58aa08377a737ec9e;hb=057941094d61629308857719fe41c9e0c49ee312;hp=83cfbf4af7e24368643bc1e752d0c90f0a51fc5d;hpb=61ff560afc8381d983571ad7395c4d9db1ca998f;p=ci-management.git diff --git a/jjb/tldk/tldk.yaml b/jjb/tldk/tldk.yaml index 83cfbf4af..1b9610502 100644 --- a/jjb/tldk/tldk.yaml +++ b/jjb/tldk/tldk.yaml @@ -18,7 +18,7 @@ name: '{project}-verify-{stream}-{os}' project-type: freestyle - node: 'verify-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -42,9 +42,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -57,11 +54,15 @@ - shell: !include-raw-escape: include-raw-build.sh + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - job-template: name: '{project}-verify-image-{stream}-{os}' project-type: freestyle - node: 'verify-image-{os}' + node: '{os}-basebuild-4c-4g' concurrent: true logrotate: @@ -85,9 +86,6 @@ choosing-strategy: 'gerrit' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -113,11 +111,15 @@ - shell: !include-raw-escape: include-raw-build.sh + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new' + - job-template: name: '{project}-merge-{stream}-{os}' project-type: freestyle - node: 'merge-{os}' + node: '{os}-basebuild-4c-4g' logrotate: daysToKeep: '{build-days-to-keep}' @@ -140,9 +142,6 @@ choosing-strategy: 'default' wrappers: - - ssh-agent-credentials: - users: - - 'jenkins-gerrit-credentials' - fdio-infra-wrappers: build-timeout: '{build-timeout}' @@ -154,3 +153,7 @@ builders: - shell: !include-raw-escape: include-raw-build.sh + + publishers: + - fdio-infra-shiplogs: + maven-version: 'mvn33-new'