diff --git a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml index 0c9cffc317..a6dade702e 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml @@ -77,6 +77,62 @@ - console-log-periodic +- job: + name: gate-tempest-devstack-vm-dfw-trial + node: devstack-precise-dfw + + wrappers: + - timeout: + timeout: 180 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export ZUUL_BRANCH=master + unset ZUUL_PROJECT + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs-periodic + - console-log-periodic + + +- job: + name: gate-tempest-devstack-vm-ord-trial + node: devstack-precise-ord + + wrappers: + - timeout: + timeout: 180 + fail: true + - timestamps + + builders: + - devstack-checkout + - shell: | + #!/bin/bash -xe + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=1 + export DEVSTACK_GATE_TEMPEST_FULL=1 + export ZUUL_BRANCH=master + unset ZUUL_PROJECT + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs + + publishers: + - devstack-logs-periodic + - console-log-periodic + + - job: name: gate-tempest-devstack-vm-heat-slow node: devstack-precise diff --git a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb index 97092cf27d..66c164f0f2 100644 --- a/modules/openstack_project/templates/nodepool/nodepool.yaml.erb +++ b/modules/openstack_project/templates/nodepool/nodepool.yaml.erb @@ -21,7 +21,7 @@ providers: auth-url: 'https://identity.api.rackspacecloud.com/v2.0/' max-servers: 60 images: - - name: devstack-precise + - name: devstack-precise-dfw base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)' min-ram: 8192 setup: prepare_node_devstack.sh @@ -37,7 +37,7 @@ providers: auth-url: 'https://identity.api.rackspacecloud.com/v2.0/' max-servers: 60 images: - - name: devstack-precise + - name: devstack-precise-ord base-image: 'Ubuntu 12.04 LTS (Precise Pangolin)' min-ram: 8192 setup: prepare_node_devstack.sh @@ -128,6 +128,14 @@ targets: providers: - name: rax-iad min-ready: 2 + - name: devstack-precise-dfw + providers: + - name: rax-dfw + min-ready: 2 + - name: devstack-precise-ord + providers: + - name: rax-ord + min-ready: 2 - name: jenkins02 jenkins: url: 'https://jenkins02.openstack.org/'