Merge "Switch stable/rocky to use rocky resources" into stable/rocky

This commit is contained in:
Zuul 2018-11-13 15:43:38 +00:00 committed by Gerrit Code Review
commit a28bc8c4b7
3 changed files with 5 additions and 4 deletions

View File

@ -2,3 +2,4 @@
host=review.openstack.org host=review.openstack.org
port=29418 port=29418
project=openstack/packstack.git project=openstack/packstack.git
defaultbranch=stable/rocky

View File

@ -1,8 +1,8 @@
- hosts: compute - hosts: compute
name: setup RDO Trunk repositories name: setup RDO Trunk repositories
vars: vars:
delorean: "https://trunk.rdoproject.org/centos7-master/current-passed-ci/delorean.repo" delorean: "https://trunk.rdoproject.org/centos7-rocky/current-passed-ci/delorean.repo"
delorean_deps: "https://trunk.rdoproject.org/centos7-master/delorean-deps.repo" delorean_deps: "https://trunk.rdoproject.org/centos7-rocky/delorean-deps.repo"
tasks: tasks:
- name: Fetch DLRN repo - name: Fetch DLRN repo
get_url: get_url:

View File

@ -20,8 +20,8 @@ SCENARIO=${SCENARIO:-scenario001}
# We could want to override the default repositories or install behavior # We could want to override the default repositories or install behavior
INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true} INSTALL_FROM_SOURCE=${INSTALL_FROM_SOURCE:-true}
MANAGE_REPOS=${MANAGE_REPOS:-true} MANAGE_REPOS=${MANAGE_REPOS:-true}
DELOREAN=${DELOREAN:-https://trunk.rdoproject.org/centos7-master/current-passed-ci/delorean.repo} DELOREAN=${DELOREAN:-https://trunk.rdoproject.org/centos7-rocky/current-passed-ci/delorean.repo}
DELOREAN_DEPS=${DELOREAN_DEPS:-https://trunk.rdoproject.org/centos7-master/delorean-deps.repo} DELOREAN_DEPS=${DELOREAN_DEPS:-https://trunk.rdoproject.org/centos7-rocky/delorean-deps.repo}
GIT_BASE_URL=${GIT_BASE_URL:-git://git.openstack.org} GIT_BASE_URL=${GIT_BASE_URL:-git://git.openstack.org}
ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-} ADDITIONAL_ARGS=${ADDITIONAL_ARGS:-}
SELINUX_ENFORCING=${SELINUX_ENFORCING:-true} SELINUX_ENFORCING=${SELINUX_ENFORCING:-true}