diff options
| author |   Jiang, Yunhong <yunhong.jiang@intel.com> | 2017-04-04 23:39:49 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2017-04-04 23:39:49 +0000 |
| commit | 4419c1d7294969da13e46156257bcc96e89b008f (patch) | |
| tree | b26e7d2bd9416ff57ee178d0828477916da7ad60 | |
| parent | e797a9f954797949f676a46f5c9ceb31874f919a (diff) | |
| parent | 6cd1a71456bc1ae7f84571c5944fa250989fd110 (diff) | |
Merge "This patch includes scripts to enhance the apex build support feature for generating kernel rpms based on the branch provided in apex.conf"
| -rw-r--r-- | ci/Dockerfile | 1 | ||||
| -rw-r--r-- | ci/apex.conf | 4 | ||||
| -rwxr-xr-x | ci/apex_build.sh | 9 |
3 files changed, 8 insertions, 6 deletions
diff --git a/ci/Dockerfile b/ci/Dockerfile index d39f15dd7..04c46b5b1 100644 --- 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 a5232e3ed..03e5830bc 100644 --- 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 8e57ac847..abeac7f9f 100755 --- 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 |