From e45eda9887381c70afc26aa45b0cf9ce16bf0398 Mon Sep 17 00:00:00 2001 From: Zhijiang Hu Date: Sun, 8 Oct 2017 21:59:53 +0800 Subject: Create iso file during build Change-Id: I6ddfe8e291ea8f6d673bd82c4df310d63f61a130 Signed-off-by: Zhijiang Hu (cherry picked from commit 47d0995307685d7d3903fd909e6b1e7ad4311649) --- ci/build_rpm/build_rpms_docker.sh | 1 + docker/Dockerfile | 1 + docs/release/installation/installation_guide.rst | 17 ++++++++++------- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/ci/build_rpm/build_rpms_docker.sh b/ci/build_rpm/build_rpms_docker.sh index cdd2be35..7f6579dc 100755 --- a/ci/build_rpm/build_rpms_docker.sh +++ b/ci/build_rpm/build_rpms_docker.sh @@ -62,4 +62,5 @@ cd .. mv target/el7/noarch/installdaisy_el7_noarch.bin target/el7/noarch/opnfv-${OPNFV_ARTIFACT_VERSION}.bin chmod +x target/el7/noarch/opnfv-${OPNFV_ARTIFACT_VERSION}.bin cp target/el7/noarch/opnfv-${OPNFV_ARTIFACT_VERSION}.bin $rpm_output_dir +mkisofs -o $rpm_output_dir/opnfv-${OPNFV_ARTIFACT_VERSION}.iso target/el7/noarch/ exit $rc diff --git a/docker/Dockerfile b/docker/Dockerfile index 3418a128..0e643035 100644 --- a/docker/Dockerfile +++ b/docker/Dockerfile @@ -5,6 +5,7 @@ ENV BRANCH=${BRANCH:-master} RUN yum -y update RUN yum -y install centos-release-openstack-ocata RUN yum -y install \ + genisoimage \ wget \ coreutils \ which \ diff --git a/docs/release/installation/installation_guide.rst b/docs/release/installation/installation_guide.rst index 7e72db42..3017f1cd 100644 --- a/docs/release/installation/installation_guide.rst +++ b/docs/release/installation/installation_guide.rst @@ -21,24 +21,27 @@ Before starting the installation of the Euphrates release of OPNFV, some plannin must be done. -Retrieve the installation bin image +Retrieve the installation iso image ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -First of all, the installation bin which includes packages of Daisy, OS, +First of all, the installation iso which includes packages of Daisy, OS, OpenStack, and so on is needed for deploying your OPNFV environment. -The stable release bin image can be retrieved via `OPNFV software download page `_ +The stable release iso image can be retrieved via `OPNFV software download page `_ -The daily build bin image can be retrieved via OPNFV artifact repository: +The daily build iso image can be retrieved via OPNFV artifact repository: http://artifacts.opnfv.org/daisy.html -NOTE: Search the keyword "daisy/Euphrates" to locate the bin image. +NOTE: Search the keyword "daisy/Euphrates" to locate the iso image. E.g. -daisy/opnfv-gerrit-27155.bin +daisy/opnfv-2017-10-06_09-50-23.iso -The git url and sha1 of bin image are recorded in properties files. +Download the iso file, then mount it to a specified directory and get the +opnfv-*.bin from that directory. + +The git url and sha512 checksum of iso image are recorded in properties files. According to these, the corresponding deployment scripts can be retrieved. -- cgit 1.2.3-korg