openstack/project-config
Code Issues Proposed changes

Remove pointless tarball-site parameter

Browse Source 
Across the entirety of our job config corpus, we only ever set the
tarball-site parameter to tarballs.openstack.org. Instead just set
it directly in the publishers where it's needed and reduce
unwarranted confusion for people writing job configs. This also
allows us to get rid of the parameterized sites in the tarball,
wheel and war publishers.

Change-Id: I31109f41177b8c07177d7ed8ef16cbfd135131ef
This commit is contained in:
Jeremy Stanley 2016-12-19 14:48:08 +00:00
parent 689a63af48
commit da67129d34
12 changed files with 10 additions and 835 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
dev/jenkins/jobs/projects.yaml
View File

@ -4,7 +4,6 @@
- project:
name: noop
tarball-site: tarballs.openstack.org
jobs:
- '{pipeline}-noop':

1
jenkins/jobs/gerrit-plugin-jobs.yaml
View File

@ -34,7 +34,6 @@
publishers:
- war:
site: '{tarball-site}'
warfile: 'gerrit/buck-out/gen/plugins/{plugin-name}/{plugin-name}-*.jar'
target: 'tarballs/ci/gerrit/plugins/{plugin-name}'
- console-log

2
jenkins/jobs/gerrit.yaml
View File

@ -26,7 +26,6 @@
publishers:
- war:
site: 'tarballs.openstack.org'
warfile: 'gerrit/buck-out/gen/gerrit-*.war'
target: 'tarballs/ci/test'
- console-log
@ -59,7 +58,6 @@
publishers:
- war:
site: 'tarballs.openstack.org'
warfile: 'gerrit/buck-out/gen/gerrit-*.war'
target: 'tarballs/ci/gerrit'
- console-log

3
jenkins/jobs/javascript.yaml
View File

@ -9,7 +9,7 @@
- print-template-name:
template-name: "{template-name}"
- shell: |
/usr/local/jenkins/slave_scripts/npm-tarball-upload.sh {name} {tarball-site}
/usr/local/jenkins/slave_scripts/npm-tarball-upload.sh {name} tarballs.openstack.org
publishers:
- console-log
@ -135,7 +135,6 @@
publishers:
- tarball:
project: '{name}'
site: '{tarball-site}'
- scp:
site: 'static.openstack.org'
files:

3
jenkins/jobs/jenkins-plugin-jobs.yaml
View File

@ -45,7 +45,6 @@
publishers:
- war:
site: '{tarball-site}'
warfile: 'target/{name}-*.hpi'
target: 'tarballs/ci/{name}'
- console-log
@ -63,7 +62,7 @@
# copy plugin artifacts from tarballs to local workspace
rm -rf *.hpi
curl -o $FILENAME_HPI http://{tarball-site}/ci/{name}/$FILENAME_HPI
curl -o $FILENAME_HPI http://tarballs.openstack.org/ci/{name}/$FILENAME_HPI
# deploy to maven repository
FILENAME_POM="{name}-$TAG.pom"

6
jenkins/jobs/macros.yaml
View File

@ -1090,7 +1090,7 @@
name: tarball
publishers:
- scp:
site: '{site}'
site: tarballs.openstack.org
files:
- target: 'tarballs/{project}/'
source: 'dist/*.tar.gz'
@ -1109,7 +1109,7 @@
name: wheel
publishers:
- scp:
site: '{site}'
site: tarballs.openstack.org
files:
- target: 'tarballs/{project}/'
source: 'dist/*.whl'
@ -1118,7 +1118,7 @@
name: war
publishers:
- scp:
site: '{site}'
site: tarballs.openstack.org
files:
- target: '{target}'
source: '{warfile}'

3
jenkins/jobs/maven-plugin-jobs.yaml
View File

@ -22,7 +22,6 @@
publishers:
- war:
site: '{tarball-site}'
warfile: 'target/{name}-*.jar'
target: 'tarballs/ci/{name}'
- console-log
@ -40,7 +39,7 @@
# copy plugin artifacts from tarballs to local workspace
rm -rf *.jar
curl -o $FILENAME_BIN http://{tarball-site}/ci/{name}/$FILENAME_BIN
curl -o $FILENAME_BIN http://tarballs.openstack.org/ci/{name}/$FILENAME_BIN
# deploy to maven repository
FILENAME_POM="{name}-$TAG.pom"

2
jenkins/jobs/oaktree.yaml
View File

@ -25,10 +25,8 @@
publishers:
- tarball:
project: oaktreemodel
site: tarballs.openstack.org
- wheel:
project: oaktreemodel
site: tarballs.openstack.org
- scp:
site: tarballs.openstack.org
files:

813
jenkins/jobs/projects.yaml
View File

File diff suppressed because it is too large Load Diff

4
jenkins/jobs/pypi-jobs.yaml
View File

@ -10,8 +10,8 @@
# and there is a mirroring issue where sometimes the first
# artifact uploaded is the only one you get. Since pip prefers
# wheels it is best to make the wheel the one we get.
/usr/local/jenkins/slave_scripts/pypi-wheel-upload.sh {name} {tarball-site}
/usr/local/jenkins/slave_scripts/pypi-tarball-upload.sh {name} {tarball-site}
/usr/local/jenkins/slave_scripts/pypi-wheel-upload.sh {name} tarballs.openstack.org
/usr/local/jenkins/slave_scripts/pypi-tarball-upload.sh {name} tarballs.openstack.org
publishers:
- console-log

3
jenkins/jobs/python-jobs.yaml
View File

@ -639,10 +639,8 @@
publishers:
- tarball:
project: '{name}'
site: '{tarball-site}'
- wheel:
project: '{name}'
site: '{tarball-site}'
- test-results
- console-log
@ -667,7 +665,6 @@
publishers:
- tarball:
project: '{name}'
site: '{tarball-site}'
- test-results
- console-log

4
jenkins/jobs/signing-jobs.yaml
View File

@ -9,11 +9,11 @@
- gerrit-git-prep
- shell: |
/usr/local/jenkins/slave_scripts/tarball-signing.sh {name} \
{tarball-site}
tarballs.openstack.org
publishers:
- scp:
site: '{tarball-site}'
site: tarballs.openstack.org
files:
- target: 'tarballs/{name}/'
source: '*.asc'