From e0ad308dbbc5c91d1b79605a6cea460de7cdb057 Mon Sep 17 00:00:00 2001 From: Saku Chydenius Date: Mon, 20 May 2019 12:56:02 +0300 Subject: [PATCH] Make product configuration TA specific This change makes product specific content RPMs available to the ISO image build. Change-Id: Ibe413d6adad4fcf649c5bca81531891e5599f117 Signed-off-by: Saku Chydenius --- build_config.ini | 17 ++++++++--------- product-manifest.spec | 2 +- 2 files changed, 9 insertions(+), 10 deletions(-) diff --git a/build_config.ini b/build_config.ini index 02e6ef3..070bdec 100644 --- a/build_config.ini +++ b/build_config.ini @@ -1,21 +1,20 @@ [DEFAULT] -product=AKREC -product_release_label=%(product)s-1 -iso_image_label=%(product)s +product=TA +product_release=1 +product_release_label=%(product)s-%(product_release)s +iso_image_label=%(product_release_label)s -nexus_url=https://nexus3.att-akraino.org +nexus_url=https://nexus.akraino.org centos_reposnap=http://mirror.centos.org/centos/7 - base_image=https://cloud.centos.org/centos/7/images/CentOS-7-x86_64-GenericCloud-1809.qcow2 -docker_images=%(nexus_url)s/repository/images/custom/ci/docker [rpm] centos_sources= packager=%(product)s -vendor=%(product)s +vendor=Akraino license=ASL 2.0 -release_id=.akrec +release_id=.ta [localrepo] localrepo=file:///work/results/repo#priority=1 @@ -33,7 +32,7 @@ updates=%(centos_reposnap)s/updates/x86_64 extras=%(centos_reposnap)s/extras/x86_64 [repositories] -#akraino-rec=%(nexus_url)s/repository/rpms-release/rec/release-0/x86_64#priority=10 +akraino-ta=%(nexus_url)s/content/repositories/images-snapshots/%(product)s/release-%(product_release)s/rpms/x86_64#priority=10 docker-ce-stable=https://download.docker.com/linux/centos/7/x86_64/stable epel=https://dl.fedoraproject.org/pub/epel/7/x86_64/#exclude=ansible python2-voluptuous centos-base=%(centos_reposnap)s/os/x86_64/ diff --git a/product-manifest.spec b/product-manifest.spec index d839805..f36527e 100644 --- a/product-manifest.spec +++ b/product-manifest.spec @@ -9,7 +9,7 @@ Vendor: %{_platform_vendor} BuildArch: noarch %description -Platform build information +Product build information %prep -- 2.16.6