diff options
Diffstat (limited to 'build')
| -rwxr-xr-x | build/overcloud-opendaylight.sh | 22 |
1 files changed, 4 insertions, 18 deletions
diff --git a/build/overcloud-opendaylight.sh b/build/overcloud-opendaylight.sh index 024c6a5d..9e85859d 100755 --- a/build/overcloud-opendaylight.sh +++ b/build/overcloud-opendaylight.sh @@ -20,14 +20,6 @@ cp -f overcloud-full.qcow2 overcloud-full-opendaylight_build.qcow2 ############################################### cat > ${BUILD_DIR}/opendaylight.repo << EOF -[opendaylight-6-release] -name=CentOS CBS OpenDaylight Carbon repository -baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-6-testing/\$basearch/os/ -enabled=1 -gpgcheck=0 -EOF - -cat > ${BUILD_DIR}/opendaylight_nitrogen.repo << EOF [opendaylight-7-release] name=CentOS CBS OpenDaylight Nitrogen repository baseurl=http://cbs.centos.org/repos/nfv7-opendaylight-7-testing/\$basearch/os/ @@ -45,13 +37,11 @@ EOF # OpenDaylight Puppet Module rm -rf puppet-opendaylight -git clone -b stable/carbon https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight +git clone -b stable/nitrogen https://git.opendaylight.org/gerrit/integration/packaging/puppet-opendaylight pushd puppet-opendaylight > /dev/null -git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz +git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz git checkout master git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-master.tar.gz -git checkout stable/nitrogen -git archive --format=tar.gz --prefix=opendaylight/ HEAD > ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz popd > /dev/null # cache gluon @@ -75,15 +65,11 @@ LIBGUESTFS_BACKEND=direct $VIRT_CUSTOMIZE \ --upload ${BUILD_DIR}/opendaylight_master.repo:/etc/yum.repos.d/opendaylight.repo \ --run-command "mkdir -p /root/master" \ --run-command "yumdownloader --destdir=/root/master opendaylight" \ - --upload ${BUILD_DIR}/opendaylight_nitrogen.repo:/etc/yum.repos.d/opendaylight.repo \ - --run-command "mkdir -p /root/nitrogen" \ - --run-command "yum install --downloadonly --downloaddir=/root/nitrogen opendaylight" \ --upload ${BUILD_DIR}/opendaylight.repo:/etc/yum.repos.d/opendaylight.repo \ --install opendaylight,python-networking-odl \ - --upload ${BUILD_DIR}/puppet-opendaylight-carbon.tar.gz:/etc/puppet/modules/ \ - --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-carbon.tar.gz" \ + --upload ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz:/etc/puppet/modules/ \ + --run-command "cd /etc/puppet/modules/ && tar xzf puppet-opendaylight-nitrogen.tar.gz" \ --upload ${BUILD_DIR}/puppet-opendaylight-master.tar.gz:/root/ \ - --upload ${BUILD_DIR}/puppet-opendaylight-nitrogen.tar.gz:/root/ \ --upload ${BUILD_DIR}/puppet-gluon.tar.gz:/etc/puppet/modules/ \ --run-command "cd /etc/puppet/modules/ && tar xzf puppet-gluon.tar.gz" \ --install python-click \ |