X-Git-Url: https://gerrit.fd.io/r/gitweb?a=blobdiff_plain;f=jjb%2Fci-management%2Fci-management-jobs.yaml;h=acd8ae868e86bb9fd3a9c7f344cf1be55c06b633;hb=ccb1d175ebf22931f10c3983e9a16b4d17073476;hp=823c6cc6e0595f90401f94d0767a920f6cd00b32;hpb=d1f38b41fe1e0b10682be15d21be10f42a5a0225;p=ci-management.git diff --git a/jjb/ci-management/ci-management-jobs.yaml b/jjb/ci-management/ci-management-jobs.yaml index 823c6cc6e..acd8ae868 100644 --- a/jjb/ci-management/ci-management-jobs.yaml +++ b/jjb/ci-management/ci-management-jobs.yaml @@ -101,118 +101,6 @@ - fdio-infra-shiplogs: maven-version: 'mvn33-new' -- job-template: - name: ci-management-verify-zuul - - project-type: freestyle - node: jjb - concurrent: true - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - - scm: - - zuul-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$ZUUL_REF' - commit: '$ZUUL_COMMIT' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - builders: - - shell: - !include-raw-escape: include-raw-test-zuul.sh - -- job-template: - name: ci-management-merge-zuul - - project-type: freestyle - node: jjb - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - - scm: - - zuul-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - commit: 'origin/$ZUUL_BRANCH' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - builders: - - shell: - !include-raw-escape: include-raw-test-zuul.sh - - shell: - !include-raw-escape: include-raw-merge-zuul.sh - -- job-template: - name: ci-management-verify-nodepool - - project-type: freestyle - node: np - concurrent: true - - logrotate: - daysToKeep: 30 - numToKeep: 10 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - - scm: - - zuul-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '$ZUUL_REF' - commit: '$ZUUL_COMMIT' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - builders: - - shell: - !include-raw-escape: include-raw-test-nodepool.sh - -- job-template: - name: ci-management-merge-nodepool - - project-type: freestyle - node: np - - logrotate: - daysToKeep: 30 - numToKeep: 40 - artifactDaysToKeep: -1 - artifactNumToKeep: 5 - - scm: - - zuul-trigger-scm: - credentials-id: 'jenkins-gerrit-credentials' - refspec: '' - commit: 'origin/$ZUUL_BRANCH' - - wrappers: - - fdio-infra-wrappers: - build-timeout: '{build-timeout}' - - builders: - - shell: - !include-raw-escape: include-raw-test-nodepool.sh - - shell: - !include-raw-escape: include-raw-merge-nodepool.sh - - - - job-template: name: 'ci-management-verify-packer' project-type: freestyle @@ -253,7 +141,7 @@ server-name: 'Primary' trigger-on: - patchset-created-event: - exclude-drafts: 'false' + exclude-drafts: 'true' exclude-trivial-rebase: 'false' exclude-no-code-change: 'false' - draft-published-event