From 68d68efd1a91087fb072257a7fedf9cc34d206f9 Mon Sep 17 00:00:00 2001 From: Saku Chydenius Date: Sat, 11 May 2019 20:57:28 +0300 Subject: [PATCH] Start using latest REC RPMs available Change-Id: Ifcea3da91d086a0f64b83dff23c6ddd7789b0b05 Signed-off-by: Saku Chydenius --- build_config.ini | 2 +- packages.yaml | 5 +++++ rpmbuild.spec => product-manifest.spec | 9 +++++---- 3 files changed, 11 insertions(+), 5 deletions(-) rename rpmbuild.spec => product-manifest.spec (59%) diff --git a/build_config.ini b/build_config.ini index 5196e9a..34efddd 100644 --- a/build_config.ini +++ b/build_config.ini @@ -44,7 +44,7 @@ updates=%(centos_updatessnap_base)s/updates/x86_64 extras=%(centos_reposnap_base)s/extras/x86_64 [repositories] -akraino-rec=%(nexus_reposnaps)s/nokia/akrec/ci-483/repo#priority=2 +akraino-rec=%(nexus_url)s/repository/rpms-release/rec/release-0/x86_64#priority=10 docker-ce-stable=%(docker_reposnap_base)s/x86_64/stable epel=%(epel_reposnap_base)s/x86_64/#exclude=ansible python2-voluptuous centos-base=%(centos_reposnap_base)s/os/x86_64/ diff --git a/packages.yaml b/packages.yaml index c64672a..63a085c 100644 --- a/packages.yaml +++ b/packages.yaml @@ -11,6 +11,7 @@ wpa_supplicant: kernel-4.14.106-200.el7.x86_64: image-provision: product-manifest: +access-management: ansible: containerd.io-1.2.2-3.3.el7.x86_64: docker-ce-18.09.2-3.el7.x86_64: @@ -18,6 +19,7 @@ docker-ce-cli-18.09.2-3.el7.x86_64: caas-chartrepo: caas-cpupooler: caas-custom_metrics: +caas-danm: caas-elasticsearch: caas-etcd: caas-flannel: @@ -45,10 +47,12 @@ ceph-mds: ceph-mgr: ceph-mon: ceph-radosgw: +config-encoder-macros: mariadb: mariadb-devel: mariadb-errmsg: mariadb-server-galera: +m2crypto: galera: rabbitmq-server: openstack-ansible-os_ironic: @@ -58,6 +62,7 @@ openstack-ironic-inspector: openstack-ansible-os_keystone: openstack-keystone: python-keystone: +python2-peewee: redis: ntp: python2-virtualbmc: diff --git a/rpmbuild.spec b/product-manifest.spec similarity index 59% rename from rpmbuild.spec rename to product-manifest.spec index a5c3aad..d839805 100644 --- a/rpmbuild.spec +++ b/product-manifest.spec @@ -1,10 +1,9 @@ Name: product-manifest -Version: 0 +Version: %{_platform_product_release_build_id} Release: 1%{?dist} Summary: Product build information License: %{_platform_licence} -Source0: %{name}-%{version}.tar.gz Vendor: %{_platform_vendor} BuildArch: noarch @@ -13,11 +12,13 @@ BuildArch: noarch Platform build information %prep -%autosetup %install mkdir -p %{buildroot}/etc -cp product-release %{buildroot}/etc/ +cat > %{buildroot}/etc/product-release <