Skip to content

Commit

Permalink
Merge "Remove rally_git_* overrides"
Browse files Browse the repository at this point in the history
  • Loading branch information
Zuul authored and openstack-gerrit committed Jun 1, 2018
2 parents 962654d + 26c2c6f commit aa2ac0b
Show file tree
Hide file tree
Showing 4 changed files with 11 additions and 38 deletions.
4 changes: 0 additions & 4 deletions doc/source/contributor/periodic-work.rst
Original file line number Diff line number Diff line change
Expand Up @@ -52,10 +52,6 @@ The update script is used as follows:
# the console code should only be updated when necessary for a security fix, or for the OSA master branch
./scripts/sources-branch-updater.sh -s playbooks/defaults/repo_packages/nova_consoles.yml -b master
# the testing repositories should not be updated for stable branches as the new tests
# or other changes introduced may not work for older branches
./scripts/sources-branch-updater.sh -s playbooks/defaults/repo_packages/openstack_testing.yml -b master
# commit the changes
new_version=$(awk '/^openstack_release/ {print $2}' inventory/group_vars/all/all.yml)
git add --all
Expand Down
32 changes: 0 additions & 32 deletions playbooks/defaults/repo_packages/openstack_testing.yml

This file was deleted.

2 changes: 0 additions & 2 deletions playbooks/os-tempest-install.yml
Original file line number Diff line number Diff line change
Expand Up @@ -30,8 +30,6 @@
rsyslog_client_log_dir: "{{ tempest_log_dir }}"
rsyslog_client_config_name: "99-tempest-rsyslog-client.conf"

vars_files:
- defaults/repo_packages/openstack_testing.yml
environment: "{{ deployment_environment_variables | default({}) }}"
tags:
- tempest
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
features:
- When ``venvwithindex=True`` and ``ignorerequirements=True`` are both specified
in ``rally_git_install_fragments`` (as was previously the default), this
results in rally being installed from PyPI without any constraints being
applied. This results in inconsistent builds from day to day, and can cause
build failures for stable implementations due to new library releases.
Going forward, we remove the ``rally_git_*`` overrides in
``playbooks/defaults/repo_packages/openstack_testing.yml`` so that
the integrated build installs rally from PyPI, but with appropriate
constraints applied.

0 comments on commit aa2ac0b

Please sign in to comment.