Change stable repos layout
* Download TripleO packages from their "current" (e.g. current-pike) * Download all the rest from their promoted repos (current-tripleo). It's not realistic to deploy TripleO projects from the latest tag promoted, some fixes have been merged in the meantime, not released and promoted (chichen and egg, can't be released if not merged) so we really need to deploy the TripleO projects from current. Example: https://review.openstack.org/#/c/533380/ doesn't pass because it's testing an old version of puppet-tripleo that doesn't contain the fixes that we need to land https://review.openstack.org/#/c/533380/ and fix scenario001 (voting in gate). Therefore, let's deploy the TripleO projects from current and not from their latest promoted version. Change-Id: If4920c9971005ea65c1b4db11312339072ee6be9
This commit is contained in:
Sagi Shnaidman
parent
9600a9d195
commit
21138dacfc
|
|
@ -15,6 +15,7 @@ inject_images:
|
|||
- "overcloud-full.vmlinuz"
|
||||
release: newton
|
||||
dlrn_hash_tag: current-passed-ci
|
||||
dlrn_hash_tag_newest: current
|
||||
overcloud_image_url: http://66.187.229.139/builds-newton/current-tripleo/overcloud-full.tar
|
||||
ipa_image_url: http://66.187.229.139/builds-newton/current-tripleo/ironic-python-agent.tar
|
||||
repo_cmd_before: |
|
||||
|
|
@ -31,19 +32,40 @@ repo_cmd_before: |
|
|||
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
|
||||
fi
|
||||
rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/current/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-newton/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
if [[ -z "$rdo_dlrn" ]]; then
|
||||
echo "Failed to parse dlrn hash"
|
||||
exit 1
|
||||
fi
|
||||
export RDO_DLRN_REPO=${rdo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
|
||||
export TRIPLEO_DLRN_REPO=${tripleo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
|
||||
|
||||
repos:
|
||||
# RDO repos
|
||||
## TripleO packages from current-newton
|
||||
- type: generic
|
||||
reponame: delorean-current
|
||||
filename: delorean-current.repo
|
||||
baseurl: $RDO_DLRN_REPO
|
||||
priority: 10
|
||||
includepkgs:
|
||||
- diskimage-builder
|
||||
- instack
|
||||
- instack-undercloud
|
||||
- os-apply-config
|
||||
- os-collect-config
|
||||
- os-net-config
|
||||
- os-refresh-config
|
||||
- python-tripleoclient
|
||||
- openstack-tripleo-*
|
||||
- puppet-*
|
||||
|
||||
## All other packages from newton-promoted
|
||||
- type: generic
|
||||
reponame: delorean
|
||||
filename: delorean.repo
|
||||
priority: 20
|
||||
baseurl: $RDO_DLRN_REPO
|
||||
baseurl: $TRIPLEO_DLRN_REPO
|
||||
|
||||
- type: generic
|
||||
reponame: delorean-newton-testing
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ inject_images:
|
|||
- "overcloud-full.vmlinuz"
|
||||
release: ocata
|
||||
dlrn_hash_tag: current-tripleo
|
||||
dlrn_hash_tag_newest: current
|
||||
overcloud_image_url: http://66.187.229.139/builds-ocata/current-tripleo/overcloud-full.tar
|
||||
ipa_image_url: http://66.187.229.139/builds-ocata/current-tripleo/ironic-python-agent.tar
|
||||
repo_cmd_before: |
|
||||
|
|
@ -30,20 +31,41 @@ repo_cmd_before: |
|
|||
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
|
||||
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
|
||||
fi
|
||||
rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-ocata/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
if [[ -z "$rdo_dlrn" ]]; then
|
||||
echo "Failed to parse dlrn hash"
|
||||
exit 1
|
||||
fi
|
||||
export RDO_DLRN_REPO=${rdo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
|
||||
export TRIPLEO_DLRN_REPO=${tripleo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
|
||||
|
||||
repos:
|
||||
# RDO repos
|
||||
## TripleO packages from current-ocata
|
||||
- type: generic
|
||||
reponame: delorean-current
|
||||
filename: delorean-current.repo
|
||||
baseurl: $RDO_DLRN_REPO
|
||||
priority: 10
|
||||
includepkgs:
|
||||
- diskimage-builder
|
||||
- instack
|
||||
- instack-undercloud
|
||||
- os-apply-config
|
||||
- os-collect-config
|
||||
- os-net-config
|
||||
- os-refresh-config
|
||||
- python-tripleoclient
|
||||
- openstack-tripleo-*
|
||||
- puppet-*
|
||||
|
||||
## All other packages from ocata-promoted
|
||||
- type: generic
|
||||
reponame: delorean
|
||||
filename: delorean.repo
|
||||
priority: 20
|
||||
baseurl: $RDO_DLRN_REPO
|
||||
baseurl: $TRIPLEO_DLRN_REPO
|
||||
|
||||
- type: generic
|
||||
reponame: delorean-ocata-testing
|
||||
|
|
|
|||
|
|
@ -15,6 +15,7 @@ inject_images:
|
|||
- "overcloud-full.vmlinuz"
|
||||
release: pike
|
||||
dlrn_hash_tag: current-tripleo
|
||||
dlrn_hash_tag_newest: current
|
||||
docker_registry_host: docker.io
|
||||
docker_registry_namespace: tripleopike
|
||||
docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
|
||||
|
|
@ -33,20 +34,41 @@ repo_cmd_before: |
|
|||
export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
|
||||
export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
|
||||
fi
|
||||
rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7-pike/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
|
||||
if [[ -z "$rdo_dlrn" ]]; then
|
||||
echo "Failed to parse dlrn hash"
|
||||
exit 1
|
||||
fi
|
||||
export RDO_DLRN_REPO=${rdo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
|
||||
export TRIPLEO_DLRN_REPO=${tripleo_dlrn/https:\/\/trunk.rdoproject.org/$NODEPOOL_RDO_PROXY}
|
||||
|
||||
repos:
|
||||
# RDO repos
|
||||
## TripleO packages from current-pike
|
||||
- type: generic
|
||||
reponame: delorean-current
|
||||
filename: delorean-current.repo
|
||||
baseurl: $RDO_DLRN_REPO
|
||||
priority: 10
|
||||
includepkgs:
|
||||
- diskimage-builder
|
||||
- instack
|
||||
- instack-undercloud
|
||||
- os-apply-config
|
||||
- os-collect-config
|
||||
- os-net-config
|
||||
- os-refresh-config
|
||||
- python-tripleoclient
|
||||
- openstack-tripleo-*
|
||||
- puppet-*
|
||||
|
||||
## All other packages from pike-promoted
|
||||
- type: generic
|
||||
reponame: delorean
|
||||
filename: delorean.repo
|
||||
priority: 20
|
||||
baseurl: $RDO_DLRN_REPO
|
||||
baseurl: $TRIPLEO_DLRN_REPO
|
||||
|
||||
- type: generic
|
||||
reponame: delorean-pike-testing
|
||||
|
|
|
|||
Loading…
Reference in New Issue