Merge "Add Queens->Master upgrades release file."

config/release/tripleo-ci/master-undercloud-queens-overcloud.yml

@@ -1,8 +1,8 @@
 release: master
 #TODO Figure out if we can remove target_upgrade_version to replace by
 #     release so we avoid duplication.
-target_upgrade_version: queens
+target_upgrade_version: master
-overcloud_release: pike
+overcloud_release: queens
 dlrn_hash_tag: current-tripleo
 dlrn_hash_tag_newest: current
 docker_registry_host: docker.io
@@ -11,8 +11,8 @@ docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}"
 overcloud_docker_registry_namespace: "tripleo{{ overcloud_release }}"
 overcloud_docker_image_tag: "{{ overcloud_dlrn_hash }}"
 undercloud_image_url: https://images.rdoproject.org/master/delorean/{{ dlrn_hash|default(dlrn_hash_tag) }}/undercloud.qcow2
-ipa_image_url: https://images.rdoproject.org/pike/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
+ipa_image_url: https://images.rdoproject.org/queens/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar
-overcloud_image_url: https://images.rdoproject.org/pike/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
+overcloud_image_url: https://images.rdoproject.org/queens/delorean/{{ overcloud_dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar
 images:
     - name: undercloud
       url: "{{ undercloud_image_url }}"
@@ -37,33 +37,35 @@ repo_cmd_before: |
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum clean all;
   sudo yum-config-manager --disable "*"
-  export CURRENT_RDO_MIRROR=`curl -L --silent https://trunk.rdoproject.org/centos7/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
+  if [ -e /etc/ci/mirror_info.sh ]; then
-  export CURRENT_TRIPLEO_MIRROR=`curl -L --silent https://trunk.rdoproject.org/centos7/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
+    source /etc/ci/mirror_info.sh
-  # If running tripleo-quickstart from review.openstack.org or review.rdoproject.org, try to use AFS mirrors
+  else
-  if [[ -e /etc/ci/mirror_info.sh ]]; then
+    # Otherwise, fallback to official mirrors provided by CentOS.
-  eval $(source /etc/ci/mirror_info.sh; echo NODEPOOL_MIRROR_HOST="$NODEPOOL_MIRROR_HOST"; echo NODEPOOL_BUILDLOGS_CENTOS_PROXY="$NODEPOOL_BUILDLOGS_CENTOS_PROXY")
+    export NODEPOOL_CENTOS_MIRROR={{ lookup('env','NODEPOOL_CENTOS_MIRROR')|default('http://mirror.centos.org/centos', true) }}
-  export NODEPOOL_MIRROR_HOST="http://${NODEPOOL_MIRROR_HOST}"
+    export NODEPOOL_BUILDLOGS_CENTOS_PROXY=https://buildlogs.centos.org
-  export NODEPOOL_BUILDLOGS_CENTOS_PROXY=$NODEPOOL_BUILDLOGS_CENTOS_PROXY
+    export NODEPOOL_RDO_PROXY=https://trunk.rdoproject.org
-  export CURRENT_RDO_MIRROR=${CURRENT_RDO_MIRROR/https:\/\/trunk.rdoproject.org/$NODEPOOL_MIRROR_HOST:8080/rdo}
-  export CURRENT_TRIPLEO_MIRROR=${CURRENT_TRIPLEO_MIRROR/https:\/\/trunk.rdoproject.org/$NODEPOOL_MIRROR_HOST:8080/rdo}
   fi
-  # Otherwise, fallback to official mirrors provided by CentOS.
+  rdo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  export NODEPOOL_MIRROR_HOST="${NODEPOOL_MIRROR_HOST:-http://mirror.centos.org}"
+  tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2`
-  export NODEPOOL_BUILDLOGS_CENTOS_PROXY="${NODEPOOL_BUILDLOGS_CENTOS_PROXY:-https://buildlogs.centos.org}"
+  if [[ -z "$rdo_dlrn" || -z "$tripleo_dlrn" ]]; then
-  export NODEPOOL_RDO_PROXY="${NODEPOOL_RDO_PROXY:-https://trunk.rdoproject.org}"
+    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
   - type: generic
     reponame: delorean
     filename: delorean.repo
-    baseurl: $CURRENT_TRIPLEO_MIRROR
     priority: 20
-    hash_url: https://trunk.rdoproject.org/centos7-master/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo
+    baseurl: $TRIPLEO_DLRN_REPO
 
   - type: generic
     reponame: delorean-current
     filename: delorean-current.repo
-    baseurl: $CURRENT_RDO_MIRROR
+    baseurl: $RDO_DLRN_REPO
     priority: 10
     includepkgs:
       - diskimage-builder
@@ -74,13 +76,7 @@ repos:
       - os-net-config
       - os-refresh-config
       - python-tripleoclient*
-      - openstack-tripleo-common*
+      - openstack-tripleo-*
-      - openstack-tripleo-heat-templates
-      - openstack-tripleo-image-elements
-      - openstack-tripleo
-      - openstack-tripleo-puppet-elements
-      - openstack-puppet-modules
-      - openstack-tripleo-ui
       - puppet-*
 
   - type: generic
@@ -92,32 +88,32 @@ repos:
   - type: generic
     reponame: quickstart-centos-base
     filename: quickstart-centos-base.repo
-    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/os/x86_64/
+    baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/os/x86_64/
 
   - type: generic
     reponame: quickstart-centos-updates
     filename: quickstart-centos-updates.repo
-    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/updates/x86_64/
+    baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/updates/x86_64/
 
   - type: generic
     reponame: quickstart-centos-extras
     filename: quickstart-centos-extras.repo
-    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/extras/x86_64/
+    baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/extras/x86_64/
 
   - type: generic
     reponame: quickstart-centos-qemu
     filename: quickstart-centos-qemu.repo
-    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/virt/x86_64/kvm-common/
+    baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/virt/x86_64/kvm-common/
 
   - type: generic
     reponame: quickstart-centos-ceph-luminous
     filename: quickstart-centos-ceph-luminous.repo
-    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/storage/x86_64/ceph-luminous/
+    baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/storage/x86_64/ceph-luminous/
 
   - type: generic
     reponame: quickstart-centos-opstools
     filename: quickstart-centos-opstools.repo
-    baseurl: ${NODEPOOL_MIRROR_HOST}/centos/7/opstools/x86_64/
+    baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/opstools/x86_64/
 
 repo_cmd_after: |
   sudo yum install -y yum-plugin-priorities;
@@ -125,7 +121,8 @@ repo_cmd_after: |
   {%endif %}
   sudo yum-config-manager --disable rdo-qemu-ev;
   sudo rpm -e epel-release || true;
-  sudo yum remove -y rdo-release || true;
+  sudo yum remove -y rdo-release centos-release-ceph-* centos-release-openstack-* || true;
+  sudo rm -rf /etc/yum.repos.d/CentOS-OpenStack-*.repo /etc/yum.repos.d/CentOS-Ceph-*.repo /etc/yum.repos.d/CentOS-QEMU-EV.repo;
   sudo rm -rf /etc/yum.repos.d/*.rpmsave;
   sudo yum repolist;
   sudo yum clean metadata