opendev/system-config
Code Issues Proposed changes

Add needed job parameters for devstack runtime stats.

Browse Source 
Also, replace massive duplication in the devstack job descriptions
with better use of macros.

Change-Id: I18d7c343d285bd21353c6275e961f9e19867631e
Reviewed-on: https://review.openstack.org/19554
Approved: James E. Blair <corvus@inaugust.com>
Reviewed-by: James E. Blair <corvus@inaugust.com>
Tested-by: Jenkins
This commit is contained in:
James E. Blair 2013-01-12 10:36:44 -08:00 committed by Jenkins
parent 97d5b7b040
commit 58156ac848
2 changed files with 86 additions and 225 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

267
modules/openstack_project/files/jenkins_job_builder/config/devstack-gate.yaml
View File

@ -18,10 +18,7 @@
- zuul - zuul
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -32,19 +29,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- job: - job:
@ -67,10 +54,7 @@
- zuul - zuul
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -82,19 +66,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- job: - job:
@ -117,10 +91,7 @@
- zuul - zuul
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -132,19 +103,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- job: - job:
@ -167,10 +128,7 @@
- zuul - zuul
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -182,19 +140,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- job: - job:
@ -217,10 +165,7 @@
- zuul - zuul
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -232,19 +177,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- job: - job:
@ -261,10 +196,7 @@
- timed: '0 6 * * *' - timed: '0 6 * * *'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -277,19 +209,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: openstack-qa@lists.openstack.org recipients: openstack-qa@lists.openstack.org
@ -308,10 +230,7 @@
- timed: '@hourly' - timed: '@hourly'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -325,20 +244,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
condition: SUCCESS
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: david.kranz@qrclab.com sdague@linux.vnet.ibm.com recipients: david.kranz@qrclab.com sdague@linux.vnet.ibm.com
@ -357,10 +265,7 @@
- timed: '0 6 * * *' - timed: '0 6 * * *'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -372,19 +277,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: openstack-diablo-maint@lists.launchpad.net recipients: openstack-diablo-maint@lists.launchpad.net
@ -403,10 +298,7 @@
- timed: '0 6 * * *' - timed: '0 6 * * *'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -418,19 +310,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: openstack-essex-maint@lists.launchpad.net recipients: openstack-essex-maint@lists.launchpad.net
@ -449,10 +331,7 @@
- timed: '0 6 * * *' - timed: '0 6 * * *'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -464,19 +343,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: openstack-stable-maint@lists.openstack.org recipients: openstack-stable-maint@lists.openstack.org
@ -495,10 +364,7 @@
- timed: '0 6 * * *' - timed: '0 6 * * *'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -511,19 +377,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: openstack-stable-maint@lists.openstack.org recipients: openstack-stable-maint@lists.openstack.org
@ -542,10 +398,7 @@
- timed: '0 6 * * *' - timed: '0 6 * * *'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -560,19 +413,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: openstack-qa@lists.openstack.org recipients: openstack-qa@lists.openstack.org
@ -591,10 +434,7 @@
- timed: '0 6 * * *' - timed: '0 6 * * *'
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -608,19 +448,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs-periodic
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log-periodic - console-log-periodic
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- email: - email:
recipients: openstack-qa@lists.openstack.org recipients: openstack-qa@lists.openstack.org
@ -645,10 +475,7 @@
- zuul - zuul
builders: builders:
- trigger-builds: - devstack-inprogress
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- devstack-checkout - devstack-checkout
- shell: | - shell: |
#!/bin/bash -xe #!/bin/bash -xe
@ -660,19 +487,9 @@
- link-logs - link-logs
publishers: publishers:
- scp: - devstack-logs
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- console-log - console-log
- trigger-parameterized-builds: - devstack-complete
- project: devstack-update-complete
when: complete
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
# Called by devstack jobs to alert that they have started so that the # Called by devstack jobs to alert that they have started so that the

44
modules/openstack_project/files/jenkins_job_builder/config/macros.yaml
View File

@ -122,6 +122,14 @@
cd .. cd ..
fi fi
- builder:
name: devstack-inprogress
builders:
- trigger-builds:
- project: devstack-update-inprogress
predefined-parameters:
DEVSTACK_NODE_NAME=${NODE_NAME}
- builder: - builder:
name: link-logs name: link-logs
builders: builders:
@ -209,3 +217,39 @@
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER' - target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
copy-console: true copy-console: true
copy-after-failure: true copy-after-failure: true
- publisher:
name: devstack-logs
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/$ZUUL_CHANGE/$ZUUL_PATCHSET/$ZUUL_PIPELINE/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- publisher:
name: devstack-logs-periodic
publishers:
- scp:
site: 'static.openstack.org'
files:
- target: 'logs/periodic/$JOB_NAME/$BUILD_NUMBER'
source: 'logs/**'
keep-hierarchy: true
copy-after-failure: true
- publisher:
name: devstack-complete
publishers:
- trigger-parameterized-builds:
- project: devstack-update-complete
when: complete
predefined-parameters: |
DEVSTACK_NODE_NAME=${NODE_NAME}
UPSTREAM_BUILD_URL=${BUILD_URL}
UPSTREAM_JOB_NAME=${JOB_NAME}
UPSTREAM_BRANCH=${ZUUL_BRANCH}