diff --git a/jenkins/jobs/kuryr.yaml b/jenkins/jobs/kuryr.yaml index d16d90e8d0..5912da70ac 100644 --- a/jenkins/jobs/kuryr.yaml +++ b/jenkins/jobs/kuryr.yaml @@ -1,5 +1,5 @@ - job-template: - name: '{pipeline}-install-dsvm-kuryr-libnetwork{job-suffix}' + name: '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{job-suffix}' node: '{node}' wrappers: @@ -38,7 +38,7 @@ - console-log - job-template: - name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}' + name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{job-suffix}' node: '{node}' wrappers: @@ -91,7 +91,7 @@ - console-log - job-template: - name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}' + name: '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{job-suffix}' node: '{node}' wrappers: diff --git a/jenkins/jobs/projects.yaml b/jenkins/jobs/projects.yaml index 266355a40e..8f3ec8dae3 100644 --- a/jenkins/jobs/projects.yaml +++ b/jenkins/jobs/projects.yaml @@ -6593,30 +6593,30 @@ suffix: '' - openstack-publish-jobs - pypi-jobs - - '{pipeline}-install-dsvm-kuryr-libnetwork{job-suffix}': + - '{pipeline}-install-dsvm-kuryr-libnetwork-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty + node: ubuntu-xenial job-suffix: '-nv' branch-override: default - - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}': + - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty + node: ubuntu-xenial kuryr_lib-src: '' job-suffix: '-nv' branch-override: default - - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack{job-suffix}': + - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-fullstack-{node}{job-suffix}': pipeline: gate node: ubuntu-xenial kuryr_lib-src: '-kuryr_lib-src' job-suffix: '-nv' branch-override: default - - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}': + - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{job-suffix}': pipeline: gate - node: ubuntu-trusty + node: ubuntu-xenial kuryr_lib-src: '' job-suffix: '-nv' branch-override: default - - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally{job-suffix}': + - '{pipeline}-kuryr-libnetwork{kuryr_lib-src}-dsvm-rally-{node}{job-suffix}': pipeline: gate node: ubuntu-xenial kuryr_lib-src: '-kuryr_lib-src' diff --git a/zuul/layout.yaml b/zuul/layout.yaml index a8be3f257e..41c5cd0b5c 100755 --- a/zuul/layout.yaml +++ b/zuul/layout.yaml @@ -2753,13 +2753,13 @@ jobs: # NOTE(limao): Only run these jobs on kuryr-libnetwork master branch, # because we do not need to check if kuryr-libnetwork stable branch # can work with kuryr_lib master. - - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-nv + - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-ubuntu-xenial-nv branch: master # NOTE(limao): Only run these jobs on kuryr-libnetwork master branch, # because we do not need to check if kuryr-libnetwork stable branch # can work with kuryr_lib master. - - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-nv + - name: gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-ubuntu-xenial-nv branch: master - name: gate-solum-infra-guestagent-python34 @@ -10968,11 +10968,11 @@ projects: check: - kuryr-libnetwork-coverage-ubuntu-trusty - kuryr-libnetwork-coverage-ubuntu-xenial - - gate-install-dsvm-kuryr-libnetwork-nv - - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-nv - - gate-kuryr-libnetwork-dsvm-fullstack-nv - - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-nv - - gate-kuryr-libnetwork-dsvm-rally-nv + - gate-install-dsvm-kuryr-libnetwork-ubuntu-xenial-nv + - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-fullstack-ubuntu-xenial-nv + - gate-kuryr-libnetwork-dsvm-fullstack-ubuntu-xenial-nv + - gate-kuryr-libnetwork-kuryr_lib-src-dsvm-rally-ubuntu-xenial-nv + - gate-kuryr-libnetwork-dsvm-rally-ubuntu-xenial-nv - name: openstack/kwapi template: