From 27431138f255354ddbdcc0a14f8024e1c6d3282c 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: Iac1e842bb6bbb4201c439a71c9917d478e5ae110 --- .../files/jenkins_job_builder/config/pbr.yaml | 35 ---------------- .../jenkins_job_builder/config/projects.yaml | 16 +++++--- .../config/requirements.yaml | 40 +++++++++++-------- .../openstack_project/files/zuul/layout.yaml | 12 ++++-- 4 files changed, 41 insertions(+), 62 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 28a6550e1e..0000000000 --- a/modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml +++ /dev/null @@ -1,35 +0,0 @@ -- job-template: - name: '{pipeline}-pbr-devstack-vm-rawinstall' - node: '{node}' - - wrappers: - - timeout: - timeout: 120 - fail: true - - timestamps - - builders: - - 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 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 9feaa31476..b0e005b606 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/projects.yaml @@ -197,12 +197,6 @@ - openstack-publish-jobs - python-jobs - pypi-jobs - - '{pipeline}-pbr-devstack-vm-rawinstall': - pipeline: gate - node: devstack-precise - - '{pipeline}-pbr-devstack-vm-rawinstall': - pipeline: check - node: 'devstack-precise || devstack-precise-check' - project: @@ -922,6 +916,16 @@ pipeline: check node: 'devstack-precise || devstack-precise-check' +- project: + name: requirements-jobs + + jobs: + - '{pipeline}-requirements-integration': + pipeline: gate + node: devstack-precise + - '{pipeline}-requirements-integration': + pipeline: check + node: 'devstack-precise || devstack-precise-check' - project: name: tempest 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 b04c085d37..7ebeb99efa 100644 --- a/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml +++ b/modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml @@ -1,26 +1,32 @@ -- job: - name: gate-requirements-install - node: precise +- job-template: + name: '{pipeline}-requirements-integration' + node: '{node}' + + wrappers: + - timeout: + timeout: 120 + fail: true + - timestamps builders: - - gerrit-git-prep + - devstack-checkout - shell: | #!/bin/bash -xe - source /usr/local/jenkins/slave_scripts/select-mirror.sh openstack requirements - virtualenv --clear .venv - FILE="global-requirements.txt" - # Ignore lines beginning with https?:// just as the mirror script does. - sed -e '/^https\?:\/\//d' $FILE > $FILE.clean - # Run the same basic pip command that the mirror script runs. - .venv/bin/pip install -M -U --exists-action=w -r $FILE.clean - if [ -e dev-requirements.txt ] ; then - .venv/bin/pip install -M -U --exists-action=w -r dev-requirements.txt - fi - - # Print all installed stuff to demonstrate versions - .venv/bin/pip freeze + export PYTHONUNBUFFERED=true + export DEVSTACK_GATE_TEMPEST=0 + export DEVSTACK_GATE_EXERCISES=0 + export DEVSTACK_GATE_REQS_INTEGRATION=1 + function gate_hook {{ + bash $GATE_SCRIPT_DIR/devstack-vm-gate.sh && \ + bash -xe $BASE/new/pbr/tools/integration.sh $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: + - devstack-logs - console-log - job: diff --git a/modules/openstack_project/files/zuul/layout.yaml b/modules/openstack_project/files/zuul/layout.yaml index 8e7fc7fee2..ef3d3c092d 100644 --- a/modules/openstack_project/files/zuul/layout.yaml +++ b/modules/openstack_project/files/zuul/layout.yaml @@ -392,8 +392,10 @@ projects: - name: openstack-infra/jeepyb check: - gate-jeepyb-pep8 + - check-requirements-integration gate: - gate-jeepyb-pep8 + - gate-requirements-integration pre-release: - jeepyb-tarball release: @@ -406,8 +408,10 @@ projects: - name: openstack-infra/pypi-mirror check: - gate-pypi-mirror-pep8 + - check-requirements-integration gate: - gate-pypi-mirror-pep8 + - gate-requirements-integration pre-release: - pypi-mirror-tarball release: @@ -1388,10 +1392,10 @@ projects: - name: openstack/requirements check: - - gate-requirements-install - gate-requirements-pep8 - gate-requirements-python27 - gate-requirements-pypy + - check-requirements-integration - check-tempest-devstack-vm-full - check-tempest-devstack-vm-postgres-full - check-tempest-devstack-vm-neutron @@ -1399,10 +1403,10 @@ projects: - check-grenade-devstack-vm - check-swift-devstack-vm-functional gate: - - gate-requirements-install - gate-requirements-pep8 - gate-requirements-python27 - gate-requirements-pypy + - gate-requirements-integration - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-postgres-full - gate-tempest-devstack-vm-neutron @@ -1475,7 +1479,7 @@ projects: - gate-pbr-python27 - gate-pbr-python33 - gate-pbr-pypy - - check-pbr-devstack-vm-rawinstall + - check-requirements-integration - check-tempest-devstack-vm-smoke - check-tempest-devstack-vm-full - check-tempest-devstack-vm-cinder @@ -1491,7 +1495,7 @@ projects: - gate-pbr-python27 - gate-pbr-python33 - gate-pbr-pypy - - gate-pbr-devstack-vm-rawinstall + - gate-requirements-integration - gate-tempest-devstack-vm-smoke - gate-tempest-devstack-vm-full - gate-tempest-devstack-vm-cinder