Browse Source

Update openstackclient-check-plugins to honor constraints

Congratulations! You're the first customer of our fine new command pbrx
install-siblings!!!

Srrsly though - the job doesn't currently honor upper-constraints, but
doing that is, it turns out, hard when you're also trying to honor
required-projects. The logic that handles doing that for tox jobs got
extracted into a tool. Use that tool here to install the code from the
required-projects repos - and pass in the constraints file so that
constraints are applied appropriately.

Depends-On: https://review.openstack.org/589476
Change-Id: Ic29d2c1bb15479bd0852b74b5d08aac7ef90048e
Monty Taylor 8 months ago
parent
commit
530e586626
No account linked to committer's email address
2 changed files with 9 additions and 11 deletions
  1. 2
    0
      .zuul.yaml
  2. 7
    11
      playbooks/openstackclient-check-plugins/run.yaml

+ 2
- 0
.zuul.yaml View File

@@ -6,6 +6,7 @@
6 6
     timeout: 1800
7 7
     required-projects:
8 8
       - openstack/openstackclient
9
+      - openstack/pbrx
9 10
       - openstack/python-openstackclient
10 11
       - openstack/python-barbicanclient
11 12
       - openstack/python-cloudkittyclient
@@ -29,6 +30,7 @@
29 30
       - openstack/python-vitrageclient
30 31
       - openstack/python-watcherclient
31 32
       - openstack/python-zaqarclient
33
+      - openstack/requirements
32 34
 
33 35
 - project-template:
34 36
     name: openstackclient-plugin-jobs

+ 7
- 11
playbooks/openstackclient-check-plugins/run.yaml View File

@@ -6,18 +6,14 @@
6 6
         cmd: |
7 7
           echo "------------------------------------------------------------"
8 8
           virtualenv osc_plugins
9
-
10
-    - shell:
11
-        cmd: |
9
+          osc_plugins/bin/pip install -e ../pbrx
12 10
           echo "------------------------------------------------------------"
13
-          osc_plugins/bin/pip install -e src/{{ item.key }}
14
-      when: item.value.required
15
-      with_dict: "{{ zuul.projects }}"
16
-
17
-    - shell:
18
-        cmd: |
11
+          osc_plugins/bin/pip install -c ../requirements/upper-constraints.txt -r requirements.txt
12
+          echo "------------------------------------------------------------"
13
+          osc_plugins/bin/pbrx install-siblings -c ../requirements/upper-constraints.txt $(find ../.. -mindepth 2 -maxdepth 2)
19 14
           echo "------------------------------------------------------------"
20
-          osc_plugins/bin/pip freeze
15
+          osc_plugins/bin/pbr freeze
21 16
           echo "------------------------------------------------------------"
22 17
           osc_plugins/bin/openstack --version
23
-          osc_plugins/bin/python src/git.openstack.org/openstack/openstackclient/tests/check_osc_commands.py
18
+          osc_plugins/bin/python tests/check_osc_commands.py
19
+        chdir: /home/zuul/src/git.openstack.org/openstack/openstackclient

Loading…
Cancel
Save