summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAaron Smith <aasmith@redhat.com>2018-01-25 12:13:55 +0000
committerGerrit Code Review <gerrit@opnfv.org>2018-01-25 12:13:55 +0000
commit206802828c9b76b56388fe270f114999713a3a8c (patch)
tree25043bab2d19c782e118966beeecc65583039ed2
parent78fdcdc56a247328d6f84c45477bbea51bddf094 (diff)
parent4b5777ae5c7089a7b55305cc9d26732ff0c94ab3 (diff)
Merge "ci: build 5.8.0 packages for Apex"
-rw-r--r--ci/README11
-rwxr-xr-xci/utility/collectd_build_rpm.sh1
-rwxr-xr-xci/utility/package-list.sh2
3 files changed, 13 insertions, 1 deletions
diff --git a/ci/README b/ci/README
new file mode 100644
index 00000000..9b255ced
--- /dev/null
+++ b/ci/README
@@ -0,0 +1,11 @@
+If you would like to build the RPMs locally you will need a CentOS7 platform.
+Set an environment variable called WORKSPACE to /tmp.
+Make sure $PERL_MM_OPT is not set as an environment variable.
+Run the following:
+
+ * sudo -E ./install_dependencies.sh
+ * sudo -E ./build_rpm.sh
+
+This will create 3 directories in /tmp: collectd, intel-cmt-cat and rpmbuild.
+
+The built RPMs can be found in rpmbuild/RPMS/x86_64/.
diff --git a/ci/utility/collectd_build_rpm.sh b/ci/utility/collectd_build_rpm.sh
index e66a5b98..a0e9cc23 100755
--- a/ci/utility/collectd_build_rpm.sh
+++ b/ci/utility/collectd_build_rpm.sh
@@ -20,6 +20,7 @@ VERSION="VERSION_NOT_SET"
cd $COLLECTD_DIR
VERSION=$( $COLLECTD_DIR/version-gen.sh )
+$COLLECTD_DIR/clean.sh
$COLLECTD_DIR/build.sh
$COLLECTD_DIR/configure
sed --regexp-extended \
diff --git a/ci/utility/package-list.sh b/ci/utility/package-list.sh
index 8cd1a7d8..0ca4aea6 100755
--- a/ci/utility/package-list.sh
+++ b/ci/utility/package-list.sh
@@ -24,4 +24,4 @@ CMTCAT_BRANCH=8b27ad757e86a01bc51eafcb9e600605ff1beca4
CMTCAT_VERSION="v1.1.0"
COLLECTD_REPO=https://github.com/collectd/collectd.git
-COLLECTD_BRANCH=d83bdb92ce4dbda05dcb7112c4e9fea1a17a3e22
+COLLECTD_BRANCH=collectd-5.8