X-Git-Url: https://gerrit.akraino.org/r/gitweb?p=ci-management.git;a=blobdiff_plain;f=jjb%2Fvalidation%2Fvalidation-docker.yaml;h=e7a5b63952211851cb18d38b54c42cb343a965fb;hp=17f67d3cf143f29da9e0b059e7211627ff4e4572;hb=d6599fc6635db6e8d35e8b036a71f3f8f51a6875;hpb=ace07dbbc3717917aea54ff598933a6a7377b4bc diff --git a/jjb/validation/validation-docker.yaml b/jjb/validation/validation-docker.yaml index 17f67d3..e7a5b63 100644 --- a/jjb/validation/validation-docker.yaml +++ b/jjb/validation/validation-docker.yaml @@ -36,14 +36,13 @@ name: 'validation-{stream}-docker' project-type: multijob disabled: '{obj:disabled}' + node: 'centos7-builder-2c-1g' parameters: - validation-job-parameters: project: '{project}' branch: '{branch}' stream: '{stream}' - slave_label: 'ubuntu1604-docker-8c-8g' - arch_tag: 'amd64' properties: - throttle: @@ -92,13 +91,15 @@ - job-template: name: 'validation-docker-build-{arch_tag}-{stream}' disabled: '{obj:disabled}' + node: '{slave_label}' + parameters: - validation-job-parameters: project: '{project}' branch: '{branch}' stream: '{stream}' - slave_label: '{slave_label}' arch_tag: '{arch_tag}' + properties: - build-blocker: use-build-blocker: true @@ -125,13 +126,13 @@ - job-template: name: 'validation-docker-manifest-{stream}' + node: 'ubuntu1604-docker-8c-8g' parameters: - validation-job-parameters: project: '{project}' branch: '{branch}' stream: '{stream}' - slave_label: 'ubuntu1604-docker-8c-8g' disabled: '{obj:disabled}' @@ -161,9 +162,3 @@ project: '{project}' stream: '{stream}' branch: '{branch}' - - label: - name: SLAVE_LABEL - default: '{slave_label}' - description: 'Slave label on Jenkins' - all-nodes: false - node-eligibility: 'ignore-offline'