diff --git a/.zuul.yaml b/.zuul.yaml index 579d5b59..39dbe520 100644 --- a/.zuul.yaml +++ b/.zuul.yaml @@ -10,6 +10,9 @@ check: jobs: - python-tempestconf-tempest-devstack-admin + - python-tempestconf-tempest-devstack-admin-stein + - python-tempestconf-tempest-devstack-admin-rocky + - python-tempestconf-tempest-devstack-admin-queens - python-tempestconf-tempest-devstack-admin-py3 - python-tempestconf-tempest-devstack-demo - python-tempestconf-tempest-devstack-demo-py3 @@ -22,6 +25,9 @@ gate: jobs: - python-tempestconf-tempest-devstack-admin + - python-tempestconf-tempest-devstack-admin-stein + - python-tempestconf-tempest-devstack-admin-rocky + - python-tempestconf-tempest-devstack-admin-queens - python-tempestconf-tempest-devstack-admin-py3 - python-tempestconf-tempest-devstack-demo - python-tempestconf-tempest-devstack-demo-py3 @@ -31,6 +37,12 @@ - tripleo-ci-centos-7-scenario002-standalone - tripleo-ci-centos-7-standalone-os-tempest - refstack-client-devstack-tempestconf + experimental: + jobs: + - python-tempestconf-tempest-devstack-demo-stein + - python-tempestconf-tempest-devstack-demo-rocky + - python-tempestconf-tempest-devstack-demo-queens + - job: name: python-tempestconf-devstack-base @@ -134,6 +146,27 @@ cloud_user: devstack-admin tempest_concurrency: 2 +- job: + name: python-tempestconf-tempest-devstack-admin-stein + parent: python-tempestconf-tempest-devstack-admin + override-checkout: stable/stein + vars: + branch: stable/stein + +- job: + name: python-tempestconf-tempest-devstack-admin-rocky + parent: python-tempestconf-tempest-devstack-admin + override-checkout: stable/rocky + vars: + branch: stable/rocky + +- job: + name: python-tempestconf-tempest-devstack-admin-queens + parent: python-tempestconf-tempest-devstack-admin + override-checkout: stable/queens + vars: + branch: stable/queens + - job: name: python-tempestconf-tempest-devstack-demo parent: python-tempestconf-devstack-base @@ -153,6 +186,27 @@ # is resolved tempest_black_regex: 'tempest.api.compute.servers' +- job: + name: python-tempestconf-tempest-devstack-demo-stein + parent: python-tempestconf-tempest-devstack-demo + override-checkout: stable/stein + vars: + branch: stable/stein + +- job: + name: python-tempestconf-tempest-devstack-demo-rocky + parent: python-tempestconf-tempest-devstack-demo + override-checkout: stable/rocky + vars: + branch: stable/rocky + +- job: + name: python-tempestconf-tempest-devstack-demo-queens + parent: python-tempestconf-tempest-devstack-demo + override-checkout: stable/queens + vars: + branch: stable/queens + - job: name: python-tempestconf-tempest-packstack-admin parent: python-tempestconf-packstack-base diff --git a/roles/generate-tempestconf-file-cloud/README.rst b/roles/generate-tempestconf-file-cloud/README.rst index e41f44ee..29da89ab 100644 --- a/roles/generate-tempestconf-file-cloud/README.rst +++ b/roles/generate-tempestconf-file-cloud/README.rst @@ -7,6 +7,13 @@ to the output after that. **Role Variables** +.. zuul:rolevar:: branch + :type: string + :default: master + + Branch name upper-constraints will be taken into account from when + python-tempestconf is installed in a venv. + .. zuul:rolevar:: cloud_user :type: string :default: devstack diff --git a/roles/generate-tempestconf-file-cloud/tasks/main.yaml b/roles/generate-tempestconf-file-cloud/tasks/main.yaml index 5acca7bd..1aea2aa5 100644 --- a/roles/generate-tempestconf-file-cloud/tasks/main.yaml +++ b/roles/generate-tempestconf-file-cloud/tasks/main.yaml @@ -18,12 +18,24 @@ args: chdir: "{{ tempestconf_src_relative_path }}" + - name: Install python-tempestconf (with constraints) + shell: | + set -ex + export PATH=$PATH:/usr/local/sbin:/usr/sbin + source {{ virtualenvs.tempestconf }}/bin/activate + pip install -c https://opendev.org/openstack/requirements/raw/branch/{{ branch }}/upper-constraints.txt . + args: + chdir: "{{ tempestconf_src_relative_path }}" + executable: /bin/bash + when: branch is defined + - name: Install python-tempestconf pip: name: "." virtualenv: "{{ virtualenvs.tempestconf }}" chdir: "{{ tempestconf_src_relative_path }}" virtualenv_python: "{{ tempestconf_pip_virtualenv_python|default(omit) }}" + when: branch is not defined - name: Generate tempest configuration file shell: | diff --git a/roles/generate-tempestconf-file/README.rst b/roles/generate-tempestconf-file/README.rst index 53d9cc10..c0a13316 100644 --- a/roles/generate-tempestconf-file/README.rst +++ b/roles/generate-tempestconf-file/README.rst @@ -6,6 +6,13 @@ is then copied to tempest directory. **Role Variables** +.. zuul:rolevar:: branch + :type: string + :default: None + + Branch name upper-constraints will be taken into accounts from when + python-tempestconf is installed in a venv. + .. zuul:rolevar:: devstack_base_dir :type: string :default: /opt/stack diff --git a/roles/generate-tempestconf-file/tasks/main.yaml b/roles/generate-tempestconf-file/tasks/main.yaml index 397223f6..ad8dbfcb 100644 --- a/roles/generate-tempestconf-file/tasks/main.yaml +++ b/roles/generate-tempestconf-file/tasks/main.yaml @@ -21,12 +21,24 @@ args: chdir: "{{ tempestconf_src_relative_path }}" + - name: Install python-tempestconf (with constraints) + shell: | + set -ex + export PATH=$PATH:/usr/local/sbin:/usr/sbin + source {{ virtualenvs.tempestconf }}/bin/activate + pip install -c https://opendev.org/openstack/requirements/raw/branch/{{ branch }}/upper-constraints.txt . + args: + chdir: "{{ tempestconf_src_relative_path }}" + executable: /bin/bash + when: branch is defined + - name: Install python-tempestconf pip: name: "." virtualenv: "{{ virtualenvs.tempestconf }}" chdir: "{{ tempestconf_src_relative_path }}" virtualenv_python: "{{ tempestconf_pip_virtualenv_python|default(omit) }}" + when: branch is not defined - name: "Cat keystonerc_ file (only in packstack case)" shell: |