This patch includes scripts to enhance the apex build support feature

for generating kernel rpms based on the branch provided in apex.conf

Change-Id: I197ff3f9a51b3b34b31d0b9a3628610f7f915011
Signed-off-by:RajithaY<rajithax.yerrumsetty@intel.com>

diff --git a/ci/Dockerfile b/ci/Dockerfile
index d39f15d..04c46b5 100644 (file)
--- a/ci/Dockerfile
+++ b/ci/Dockerfile
@@ -10,6 +10,7 @@ RUN yum -y update && yum -y install \
   glib2-devel \
   make \
   gettext \
+  openssl-devel \
   bc \
   bison\
   flex\

diff --git a/ci/apex.conf b/ci/apex.conf
index a5232e3..03e5830 100644 (file)
--- a/ci/apex.conf
+++ b/ci/apex.conf
@@ -1,2 +1,2 @@
-branch=master
-commit_id=e1a58e17cf85b14c61c2389588ed7bf5da88fd53
+branch=stable/danube
+commit_id=977317100f3b52caafb091ad5924e5dd81982433

diff --git a/ci/apex_build.sh b/ci/apex_build.sh
index 8e57ac8..abeac7f 100755 (executable)
--- a/ci/apex_build.sh
+++ b/ci/apex_build.sh
@@ -5,11 +5,12 @@ build_dir=/opt/kvmfornfv/
 mkdir -p /tmp/kvmfornfv
 SRC=/tmp/kvmfornfv
 source ${build_dir}/ci/apex.conf
+#Cloning into /tmp/kvmfornfv
 cd $SRC
-#Cloning into /tmp/kvmfornfv from local repository
-git clone $build_dir $SRC
-if [ "$branch" == "master" ] || [ "$branch" == "danube" ];then
-   echo "Checking out on $branch branch"
+if [[ "$branch" == "master" ]] || [[ "$branch" == *"danube"* ]];then
+   echo "Cloning the repository of $branch given"
+   git clone -b $branch https://gerrit.opnfv.org/gerrit/kvmfornfv.git /tmp/kvmfornfv
+   git branch
    echo "Commit-id is ${commit_id}"
    git checkout -f ${commit_id}
    if [ $? -ne 0 ];then