opendev/system-config
Code Issues Proposed changes

Stop running pypi-mirror for old mirror creation

Browse Source 
Now that bandersnatch is running in parallel, go ahead and stop
building the pypi-mirror based mirror.

Change-Id: If5935b356e222c2f4d474a2cec8add3cc66b6010
This commit is contained in:
Monty Taylor 2014-06-28 11:05:36 -07:00
parent d291355275
commit 39f916f632
4 changed files with 8 additions and 165 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -284,16 +284,6 @@
echo "Network neighbors..."
ip neighbor show
- builder:
name: update-pypi-mirror
builders:
- shell: |
#!/bin/bash -xe
run-mirror -c /home/jenkins/pypimirror/etc/pypi-mirror.yaml
find /home/jenkins/pypimirror/mirror/ \( -name index.html -or -name full.html \) -delete
rsync -a --ignore-existing --itemize-changes /home/jenkins/pypimirror/mirror/openstack/ jenkins@static.openstack.org:/srv/static/mirror/web/openstack/
- builder:
name: install-buck
builders:

112
modules/openstack_project/files/jenkins_job_builder/config/mirror.yaml
View File

@ -1,112 +0,0 @@
- job:
name: 'periodic-mirror-python26'
node: mirror26
wrappers:
- build-timeout:
timeout: 90
- timestamps
builders:
- revoke-sudo
- link-logs
- net-info
- update-pypi-mirror
publishers:
- console-log
- job:
name: 'post-mirror-python26'
node: mirror26
wrappers:
- build-timeout:
timeout: 90
- timestamps
builders:
- revoke-sudo
- link-logs
- net-info
- update-pypi-mirror
publishers:
- console-log
- job:
name: 'periodic-mirror-python27'
node: mirror27
wrappers:
- build-timeout:
timeout: 60
- timestamps
builders:
- revoke-sudo
- link-logs
- net-info
- update-pypi-mirror
publishers:
- console-log
- job:
name: 'post-mirror-python27'
node: mirror27
wrappers:
- build-timeout:
timeout: 60
- timestamps
builders:
- revoke-sudo
- link-logs
- net-info
- update-pypi-mirror
publishers:
- console-log
- job:
name: 'periodic-mirror-python33'
node: mirror33
wrappers:
- build-timeout:
timeout: 60
- timestamps
builders:
- revoke-sudo
- link-logs
- net-info
- update-pypi-mirror
publishers:
- console-log
- job:
name: 'post-mirror-python33'
node: mirror33
wrappers:
- build-timeout:
timeout: 60
- timestamps
builders:
- revoke-sudo
- link-logs
- net-info
- update-pypi-mirror
publishers:
- console-log

47
modules/openstack_project/files/zuul/layout.yaml
View File

@ -356,30 +356,10 @@ project-templates:
- name: publish-to-pypi
pre-release:
- '{name}-tarball':
- '{name}-pypi-wheel-upload':
- post-mirror-python26
- post-mirror-python27
- post-mirror-python33
- '{name}-pypi-wheel-upload'
release:
- '{name}-tarball':
- '{name}-pypi-both-upload':
- post-mirror-python26
- post-mirror-python27
- post-mirror-python33
# Publish pre-releases as wheels and official releases as sdist and
# wheels, then sync to the python 2 mirrors only.
- name: publish-to-pypi-2only
pre-release:
- '{name}-tarball':
- '{name}-pypi-wheel-upload':
- post-mirror-python26
- post-mirror-python27
release:
- '{name}-tarball':
- '{name}-pypi-both-upload':
- post-mirror-python26
- post-mirror-python27
- '{name}-pypi-both-upload'
- name: docs-on-rtfd
post:
@ -1144,7 +1124,7 @@ projects:
- name: openstack-server-publish-jobs
- name: check-requirements
- name: integrated-gate
- name: publish-to-pypi-2only
- name: publish-to-pypi
- name: openstack/sahara
template:
@ -1335,7 +1315,7 @@ projects:
- name: openstack-client-publish-jobs
- name: check-requirements
- name: integrated-gate
- name: publish-to-pypi-2only
- name: publish-to-pypi
check:
- check-devstack-dsvm-cells
- gate-tempest-dsvm-large-ops
@ -1917,7 +1897,7 @@ projects:
- name: openstack-server-publish-jobs
- name: check-requirements
- name: integrated-gate
- name: publish-to-pypi-2only
- name: publish-to-pypi
check:
- check-devstack-dsvm-cells
- gate-tempest-dsvm-large-ops
@ -2010,7 +1990,7 @@ projects:
- name: openstack-server-publish-jobs
- name: check-requirements
- name: integrated-gate
- name: publish-to-pypi-2only
- name: publish-to-pypi
check:
- gate-oslo.version-pypy
- gate-oslo.version-python33
@ -2058,19 +2038,12 @@ projects:
- gate-tempest-dsvm-neutron-large-ops
- gate-swift-dsvm-functional
post:
- post-mirror-python26
- post-mirror-python27
- post-mirror-python33
- propose-requirements-updates
experimental-tripleo:
- check-tripleo-ironic-seed-precise
- check-tripleo-undercloud-precise
- check-tripleo-ironic-undercloud-precise
- check-tripleo-overcloud-precise
periodic:
- periodic-mirror-python26
- periodic-mirror-python27
- periodic-mirror-python33
# TODO: add docs
- name: openstack/sahara-dashboard
@ -2954,10 +2927,6 @@ projects:
gate:
- gate-pypi-mirror-pep8
- gate-requirements-integration-dsvm
post:
- post-mirror-python26
- post-mirror-python27
- post-mirror-python33
- name: stackforge/python-jenkins
# docs is missing a build_sphinx entry point in setup.py
@ -4421,7 +4390,7 @@ projects:
template:
- name: python-jobs
- name: check-requirements
- name: publish-to-pypi-2only
- name: publish-to-pypi
check:
- gate-solum-dashboard-pypy
gate:
@ -4609,7 +4578,7 @@ projects:
- name: stackforge/tomograph
template:
- name: publish-to-pypi-2only
- name: publish-to-pypi
check:
- gate-tomograph-pep8
- gate-tomograph-python26

4
modules/openstack_project/files/zuul/openstack_functions.py
View File

@ -85,7 +85,6 @@ def set_node_options(item, job, params, default):
params['OFFLINE_NODE_WHEN_COMPLETE'] = '1'
proposal_re = r'^.*(merge-release-tags|(propose|upstream)-(requirements|translation)-updates?)$' # noqa
pypi_re = r'^.*-(jenkinsci|mavencentral|pypi-(both|wheel))-upload$'
mirror_re = r'^(periodic|post)-mirror-python(26|27|33)$'
python26_re = r'^.*-py(thon)?26.*$'
centos6_re = r'^.*-centos6.*$'
f20_re = r'^.*-f20.*$'
@ -95,9 +94,6 @@ def set_node_options(item, job, params, default):
# jobs run on the proposal worker
if re.match(proposal_re, job.name) or re.match(pypi_re, job.name):
reusable_node(item, job, params)
# jobs run on the mirror26, mirror27 and mirror33 workers
elif re.match(mirror_re, job.name):
reusable_node(item, job, params)
# Jobs needing python26
elif re.match(python26_re, job.name):
# Pass because job specified label is always correct.