From 075f46f5aa0159644b18852cd763e387bd2f0354 Mon Sep 17 00:00:00 2001 From: Wes Hayutin Date: Thu, 25 Jan 2018 17:45:35 -0500 Subject: [PATCH] add release config for queens Adding release config for queens in preparation of branching. Change-Id: I9a30cb46f66e776a01e460e2621d709bf6b3c259 --- .../centosci/queens-current-tripleo.yml | 45 +++++++ config/release/queens.yml | 1 + config/release/tripleo-ci/queens.yml | 121 ++++++++++++++++++ config/release/trunk/queens.yml | 45 +++++++ 4 files changed, 212 insertions(+) create mode 100644 config/release/centosci/queens-current-tripleo.yml create mode 120000 config/release/queens.yml create mode 100644 config/release/tripleo-ci/queens.yml create mode 100644 config/release/trunk/queens.yml diff --git a/config/release/centosci/queens-current-tripleo.yml b/config/release/centosci/queens-current-tripleo.yml new file mode 100644 index 000000000..34a7e8004 --- /dev/null +++ b/config/release/centosci/queens-current-tripleo.yml @@ -0,0 +1,45 @@ +release: queens +dlrn_hash_tag: current-tripleo +docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" +overcloud_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar +ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar + +overcloud_as_undercloud: true +update_images: true +images: + - name: overcloud-full + url: "{{ overcloud_image_url }}" + type: tar + - name: ipa_images + url: "{{ ipa_image_url }}" + type: tar +inject_images: + - "ironic-python-agent.initramfs" + - "ironic-python-agent.kernel" + - "overcloud-full.qcow2" + - "overcloud-full.initrd" + - "overcloud-full.vmlinuz" + +repos: + - type: generic + reponame: delorean + filename: delorean.repo + baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/ + priority: 20 + + - type: file + filename: delorean-deps.repo + down_url: https://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo + + - type: package + pkg_name: centos-release-ceph-luminous + custom_cmd: 'sudo yum install -y --enablerepo=extras' + +repo_cmd_after: | + sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0 + sudo yum repolist; + sudo yum update -y + +undercloud_rpm_dependencies: >- + python-tripleoclient + ceph-ansible diff --git a/config/release/queens.yml b/config/release/queens.yml new file mode 120000 index 000000000..5de84b9de --- /dev/null +++ b/config/release/queens.yml @@ -0,0 +1 @@ +trunk/queens.yml \ No newline at end of file diff --git a/config/release/tripleo-ci/queens.yml b/config/release/tripleo-ci/queens.yml new file mode 100644 index 000000000..736c9e4df --- /dev/null +++ b/config/release/tripleo-ci/queens.yml @@ -0,0 +1,121 @@ +devmode: true +overcloud_as_undercloud: true +images: + - name: overcloud-full + url: "{{ overcloud_image_url }}" + type: tar + - name: ipa_images + url: "{{ ipa_image_url }}" + type: tar +inject_images: + - "ironic-python-agent.initramfs" + - "ironic-python-agent.kernel" + - "overcloud-full.qcow2" + - "overcloud-full.initrd" + - "overcloud-full.vmlinuz" +release: queens +dlrn_hash_tag: current-tripleo +dlrn_hash_tag_newest: current +docker_registry_host: docker.io +docker_registry_namespace: tripleoqueens +docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" +overcloud_image_url: http://66.187.229.139/builds-queens/current-tripleo/overcloud-full.tar +ipa_image_url: http://66.187.229.139/builds-queens/current-tripleo/ironic-python-agent.tar +repo_cmd_before: | + sudo yum clean all; + sudo yum-config-manager --disable "*" + sudo rm -rf /etc/yum.repos.d/delorean*; + sudo rm -rf /etc/yum.repos.d/*.rpmsave; + if [ -e /etc/ci/mirror_info.sh ]; then + source /etc/ci/mirror_info.sh + else + # Otherwise, fallback to official mirrors provided by CentOS. + export NODEPOOL_CENTOS_MIRROR=http://mirror.centos.org/centos + 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/{{ dlrn_hash_path_newest|default(dlrn_hash_tag_newest) }}/delorean.repo | grep baseurl | cut -d= -f2` + tripleo_dlrn=`curl --silent ${NODEPOOL_RDO_PROXY}/centos7/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/delorean.repo | grep baseurl | cut -d= -f2` + if [[ -z "$rdo_dlrn" || -z "$tripleo_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 + - type: generic + reponame: delorean + filename: delorean.repo + priority: 20 + baseurl: $TRIPLEO_DLRN_REPO + + - 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-* + + - type: generic + reponame: delorean-queens-deps + filename: delorean-queens-deps.repo + baseurl: ${NODEPOOL_RDO_PROXY}/centos7-queens/deps/latest/ + + # CentOS related repos + - type: generic + reponame: quickstart-centos-base + filename: quickstart-centos-base.repo + baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/os/x86_64/ + + - type: generic + reponame: quickstart-centos-updates + filename: quickstart-centos-updates.repo + baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/updates/x86_64/ + + - type: generic + reponame: quickstart-centos-extras + filename: quickstart-centos-extras.repo + baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/extras/x86_64/ + + - type: generic + reponame: quickstart-centos-qemu + filename: quickstart-centos-qemu.repo + 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_CENTOS_MIRROR}/7/storage/x86_64/ceph-luminous/ + + - type: generic + reponame: quickstart-centos-opstools + filename: quickstart-centos-opstools.repo + baseurl: ${NODEPOOL_CENTOS_MIRROR}/7/opstools/x86_64/ + +repo_cmd_after: | + sudo yum install -y yum-plugin-priorities; + {% if not enable_opstools_repo|default(false)|bool %}sudo yum-config-manager --save --setopt centos-opstools.enable=0; + {%endif %} + sudo yum-config-manager --disable rdo-qemu-ev; + sudo rpm -e epel-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 update -y + +undercloud_rpm_dependencies: >- + python-tripleoclient + ceph-ansible diff --git a/config/release/trunk/queens.yml b/config/release/trunk/queens.yml new file mode 100644 index 000000000..d111e6aec --- /dev/null +++ b/config/release/trunk/queens.yml @@ -0,0 +1,45 @@ +release: queens +dlrn_hash_tag: current-tripleo-rdo +docker_image_tag: "{{ dlrn_hash|default(dlrn_hash_tag) }}" +overcloud_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/overcloud-full.tar +ipa_image_url: https://images.rdoproject.org/{{ release }}/rdo_trunk/{{ dlrn_hash|default(dlrn_hash_tag) }}/ironic-python-agent.tar + +overcloud_as_undercloud: true +update_images: true +images: + - name: overcloud-full + url: "{{ overcloud_image_url }}" + type: tar + - name: ipa_images + url: "{{ ipa_image_url }}" + type: tar +inject_images: + - "ironic-python-agent.initramfs" + - "ironic-python-agent.kernel" + - "overcloud-full.qcow2" + - "overcloud-full.initrd" + - "overcloud-full.vmlinuz" + +repos: + - type: generic + reponame: delorean + filename: delorean.repo + baseurl: https://trunk.rdoproject.org/centos7-{{ release }}/{{ dlrn_hash_path|default(dlrn_hash_tag) }}/ + priority: 20 + + - type: file + filename: delorean-deps.repo + down_url: https://trunk.rdoproject.org/centos7-{{ release }}/delorean-deps.repo + + - type: package + pkg_name: centos-release-ceph-luminous + custom_cmd: 'sudo yum install -y --enablerepo=extras' + +repo_cmd_after: | + sudo yum-config-manager --save --setopt centos-ceph-luminous.gpgcheck=0 + sudo yum repolist; + sudo yum update -y + +undercloud_rpm_dependencies: >- + python-tripleoclient + ceph-ansible