Merge "Gate jeepyb and openstack/requirements on pbr"

modules/openstack_project/files/jenkins_job_builder/config/pbr.yaml

@@ -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

modules/openstack_project/files/jenkins_job_builder/config/projects.yaml

@@ -229,12 +229,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:
@@ -1016,6 +1010,16 @@
     jobs:
       - gate-{name}-bash8
 
+- 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

modules/openstack_project/files/jenkins_job_builder/config/requirements.yaml

@@ -1,26 +1,32 @@
-- job:
+- job-template:
-    name: gate-requirements-install
+    name: '{pipeline}-requirements-integration'
-    node: precise
+    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
+          export PYTHONUNBUFFERED=true
-          virtualenv --clear .venv
+          export DEVSTACK_GATE_TEMPEST=0
-          FILE="global-requirements.txt"
+          export DEVSTACK_GATE_EXERCISES=0
-          # Ignore lines beginning with https?:// just as the mirror script does.
+          export DEVSTACK_GATE_REQS_INTEGRATION=1
-          sed -e '/^https\?:\/\//d' $FILE > $FILE.clean
+          function gate_hook {{
-          # Run the same basic pip command that the mirror script runs.
+              bash $GATE_SCRIPT_DIR/devstack-vm-gate.sh && \
-          .venv/bin/pip install -M -U --exists-action=w -r $FILE.clean
+              bash -xe $BASE/new/pbr/tools/integration.sh $PROJECTS
-          if [ -e dev-requirements.txt ] ; then
+          }}
-              .venv/bin/pip install -M -U --exists-action=w -r dev-requirements.txt
+          export -f gate_hook
-          fi
+          cp devstack-gate/devstack-vm-gate-wrap.sh ./safe-devstack-vm-gate-wrap.sh
-
+          ./safe-devstack-vm-gate-wrap.sh
-          # Print all installed stuff to demonstrate versions
+      - link-logs
-          .venv/bin/pip freeze
 
     publishers:
+      - devstack-logs
       - console-log
 
 - job:

modules/openstack_project/files/zuul/layout.yaml

@@ -431,8 +431,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:
@@ -445,8 +447,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:
@@ -1472,10 +1476,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
@@ -1484,10 +1488,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
@@ -1561,7 +1565,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
@@ -1578,7 +1582,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