ci: build 5.8.0 packages for Apex

Change-Id: Iee1ed3e9a1d7b744a0fb94a8d031588db2b2dea2
Signed-off-by: Maryam Tahhan <maryam.tahhan@intel.com>

diff --git a/ci/README b/ci/README
new file mode 100644 (file)
index 0000000..9b255ce
--- /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 e66a5b9..a0e9cc2 100755 (executable)
--- 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 8cd1a7d..0ca4aea 100755 (executable)
--- 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