From 8a76bf3788f80302250296e8e999b3c2912bc5fd Mon Sep 17 00:00:00 2001 From: Monty Taylor Date: Sun, 21 Jul 2013 20:59:45 -0700 Subject: [PATCH] Gate jeepyb and openstack/requirements on pbr Use the pbr integration test to gate jeepyb's run-mirror as well as additions to the openstack/requirements file. Change-Id: I0da16c3987e5678af2636d77f19dd03fa86b912a --- .../files/jenkins_job_builder/config/pbr.yaml | 43 -------------- .../jenkins_job_builder/config/projects.yaml | 6 ++ .../config/requirements.yaml | 59 ++++++++++++------- .../openstack_project/files/zuul/layout.yaml | 10 ++-- 4 files changed, 50 insertions(+), 68 deletions(-) delete mode 100644 modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml diff --git a/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml b/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml deleted file mode 100644 index 340c0e2f7f..0000000000 --- a/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml +++ /dev/null @@ -1,43 +0,0 @@ -- job: - name: gate-pbr-devstack-vm-rawinstall - node: devstack-precise - - wrappers: - - timeout: - timeout: 120 - fail: true - - timestamps - - parameters: - - label: - name: NODE_LABEL - description: Label of node to use for this build - default: devstack-precise - - builders: - - devstack-inprogress - - devstack-checkout - - shell: | - #!/bin/bash -xe - export PYTHONUNBUFFERED=true - export DEVSTACK_GATE_TEMPEST=0 - export DEVSTACK_GATE_EXERCISES=0 - function gate_hook { - bash $GATE_SCRIPT_DIR/devstack-vm-gate.sh && \ - bash -xe $BASE/new/pbr/tools/integration.sh $PROJECTS $BASE - } - export -f gate_hook - cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh - ./safe-devstack-vm-gate-wrap.sh - - link-logs - - publishers: - - scp: - site: 'static.openstack.org' - files: - - target: 'logs/$LOG_PATH' - source: '**/pip.log' - keep-hierarchy: false - copy-after-failure: true - - console-log - - devstack-complete diff --git a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml index c24237808b..2ab0a26f28 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -181,11 +181,13 @@ node: precise doc-publisher-site: ci.openstack.org tarball-site: tarballs.openstack.org + mirror: mirror jobs: - openstack-publish-jobs - python-jobs - pypi-jobs + - gate-requirements-integration-{mirror} - project: @@ -232,12 +234,14 @@ node: precise doc-publisher-site: ci.openstack.org tarball-site: tarballs.openstack.org + mirror: mirror jobs: - gate-{name}-pep8 - gate-{name}-pyflakes - '{name}-tarball' - pypi-jobs + - gate-requirements-integration-{mirror} - project: @@ -804,10 +808,12 @@ node: precise tarball-site: tarballs.openstack.org doc-publisher-site: docs.openstack.org + mirror: no-mirror jobs: - gate-{name}-pep8 - gate-{name}-python27 + - gate-requirements-integration-{mirror} - project: diff --git a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml index b8e4780d82..9745875751 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -1,29 +1,46 @@ -- job: - name: gate-requirements-install - node: precise +- job-template: + name: gate-requirements-integration-{mirror} + node: devstack-precise + + wrappers: + - timeout: + timeout: 120 + fail: true + - timestamps + + parameters: + - label: + name: NODE_LABEL + description: Label of node to use for this build + default: devstack-precise builders: - - gerrit-git-prep + - devstack-inprogress + - devstack-checkout - shell: | #!/bin/bash -xe - /usr/local/jenkins/slave_scripts/select-mirror.sh openstack requirements - virtualenv --clear .venv - PIP_ARGS="" - REQ_FILES="tools/pip-requires tools/test-requires requirements.txt test-requirements.txt" - for FILE in $REQ_FILES - do - if [ -e $FILE ] - then - # Ignore lines beginning with https?:// just as the mirror script does. - sed -e '/^https\?:\/\//d' $FILE > $FILE.clean - PIP_ARGS="$PIP_ARGS -r $FILE.clean" - fi - done - # Run the same basic pip command that the mirror script runs. - .venv/bin/pip install -M -U --exists-action=w $PIP_ARGS - if [ -e dev-requirements.txt ] ; then - .venv/bin/pip install -M -U --exists-action=w -r dev-requirements.txt + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_EXERCISES=0 + if [ "{mirror}" == "no-mirror" ]; then + MIRROR="--no-mirror" fi + function gate_hook ( + bash $GATE_SCRIPT_DIR/devstack-vm-gate.sh && \ + bash -xe $BASE/new/pbr/tools/integration.sh $MIRROR $PROJECTS + ) + export -f gate_hook + cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh + ./safe-devstack-vm-gate-wrap.sh + - link-logs publishers: + - scp: + site: 'static.openstack.org' + files: + - target: 'logs/$BASE_LOG_PATH/$JOB_NAME/$BUILD_NUMBER' + source: '**/pip.log' + keep-hierarchy: false + copy-after-failure: true - console-log + - devstack-complete diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index d2fab4a41d..5272038599 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -309,9 +309,11 @@ projects: check: - gate-jeepyb-pep8 - gate-jeepyb-pyflakes + - gate-requirements-integration-mirror gate: - gate-jeepyb-pep8 - gate-jeepyb-pyflakes + - gate-requirements-integration-mirror pre-release: - jeepyb-tarball release: @@ -1196,18 +1198,18 @@ projects: - name: openstack/requirements check: - - gate-requirements-install - gate-requirements-pep8 - gate-requirements-python27 + - gate-requirements-integration-no-mirror - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cells-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-neutron - gate-grenade-devstack-vm gate: - - gate-requirements-install - gate-requirements-pep8 - gate-requirements-python27 + - gate-requirements-integration-no-mirror - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-neutron @@ -1265,7 +1267,7 @@ projects: - gate-pbr-python26 - gate-pbr-python27 - gate-pbr-python33 - - gate-pbr-devstack-vm-rawinstall + - gate-requirements-integration-mirror - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cells-full @@ -1280,7 +1282,7 @@ projects: - gate-pbr-python26 - gate-pbr-python27 - gate-pbr-python33 - - gate-pbr-devstack-vm-rawinstall + - gate-requirements-integration-mirror - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder