From 0c1b0648b6e3037083dbfb5f430175ce92120323 Mon Sep 17 00:00:00 2001 From: Timofey Turenko Date: Tue, 21 Nov 2017 12:11:44 +0200 Subject: [PATCH] add repo config file for mdbci generation --- BUILD/mdbci/copy_repos.sh | 8 ++++++++ BUILD/mdbci/set_build_variables.sh | 5 +++++ .../templates/repository-config/deb.json.template | 10 ++++++++++ .../templates/repository-config/rpm.json.template | 10 ++++++++++ 4 files changed, 33 insertions(+) create mode 100644 BUILD/mdbci/templates/repository-config/deb.json.template create mode 100644 BUILD/mdbci/templates/repository-config/rpm.json.template diff --git a/BUILD/mdbci/copy_repos.sh b/BUILD/mdbci/copy_repos.sh index 84a260546..ef5eca33b 100755 --- a/BUILD/mdbci/copy_repos.sh +++ b/BUILD/mdbci/copy_repos.sh @@ -15,6 +15,11 @@ if [ "$box_type" == "RPM" ] ; then ln -s $platform_version "$platform_version"server ln -s $platform_version "$platform_version"Server + eval "cat < /dev/null > ${path_prefix}/${platform}_${platform_version}.json + + echo "copying done" else export arch=`ssh $sshopt "dpkg --print-architecture"` @@ -24,5 +29,8 @@ else mkdir -p $path_prefix/$platform_family/ cp -r ${unsorted_repo_dir}/$repo_name/$box/* $path_prefix/$platform_family/ env > $build_info_path + eval "cat < /dev/null > ${path_prefix}/${platform}_${platform_version}.json fi cd $dir diff --git a/BUILD/mdbci/set_build_variables.sh b/BUILD/mdbci/set_build_variables.sh index 95c76332e..069d40197 100644 --- a/BUILD/mdbci/set_build_variables.sh +++ b/BUILD/mdbci/set_build_variables.sh @@ -71,3 +71,8 @@ export repo_path=${repo_path:-$HOME/repository} export path_prefix="$repo_path/$repo_name/mariadb-$product_name/" +export ci_url=${ci_url:-"http://max-tst-01.mariadb.com/ci-repository/"} + +export deb_repo_key=${deb_repo_key:-"135659e928c12247"} + +export rpm_repo_key=${rpm_repo_key:-"$ci_url/MariaDBMaxscale-GPG-KEY.public"} diff --git a/BUILD/mdbci/templates/repository-config/deb.json.template b/BUILD/mdbci/templates/repository-config/deb.json.template new file mode 100644 index 000000000..fc2725554 --- /dev/null +++ b/BUILD/mdbci/templates/repository-config/deb.json.template @@ -0,0 +1,10 @@ +[ +{ + "product": "maxscale", + "version": "default", + "repo": "${ci_url}/${web_prefix}/${platform_family} ${platform_version} main", + "repo_key": "$deb_repo_key70E4618A8167EE24", + "platform": "$platform", + "platform_version": "${platform_version}" +} +] diff --git a/BUILD/mdbci/templates/repository-config/rpm.json.template b/BUILD/mdbci/templates/repository-config/rpm.json.template new file mode 100644 index 000000000..075b2bd36 --- /dev/null +++ b/BUILD/mdbci/templates/repository-config/rpm.json.template @@ -0,0 +1,10 @@ +[ +{ + "product": "maxscale", + "version": "default", + "repo": "${ci_url}/$web_prefix/centos/${platform_version}/\$basearch", + "repo_key": "${rpm_repo_key}", + "platform": "$platform", + "platform_version": "${platform_version}" +} +]