diff options
| author |   Tim Rozet <trozet@redhat.com> | 2018-05-30 20:49:29 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@opnfv.org> | 2018-05-30 20:49:29 +0000 |
| commit | fd7f3285fa0d872f3eb23ded248e45bf720ebda7 (patch) | |
| tree | 9fed182ca183e82d97965287d7adbb7bb355a1d1 /build | |
| parent | 5ff098787664eb141c3c169bdc194c188520ef89 (diff) | |
| parent | 3436f763ce4dd795fadc32d6546b53f9c856b3bb (diff) | |
Merge "nosdn-fdio scenarios fixes" into stable/fraser
Diffstat (limited to 'build')
| -rw-r--r-- | build/variables.sh | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/build/variables.sh b/build/variables.sh index 0ccf4846..d1edafe5 100644 --- a/build/variables.sh +++ b/build/variables.sh @@ -45,19 +45,19 @@ kvmfornfv_kernel_rpm="kvmfornfv-4bfeded9-apex-kernel-4.4.50_rt62_centos.x86_64.r calipso_uri_base="https://git.opnfv.org/calipso/plain/app/install" calipso_script="calipso-installer.py" -#netvpp_repo="https://github.com/openstack/networking-vpp" -netvpp_repo="https://github.com/fepan/networking-vpp" -netvpp_branch="test-fdio-fix" +netvpp_repo="https://github.com/openstack/networking-vpp" +netvpp_branch="master" netvpp_commit=$(git ls-remote ${netvpp_repo} ${netvpp_branch} | awk '{print substr($1,1,7)}') netvpp_pkg=python-networking-vpp-18.04-1.git${NETVPP_COMMIT}$(rpm -E %dist).noarch.rpm gluon_rpm=gluon-0.0.1-1_20170302.noarch.rpm nosdn_vpp_rpms=( -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/18.01.1-release.x86_64/vpp-18.01.1-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/18.01.1-release.x86_64/vpp-plugins-18.01.1-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/18.01.1-release.x86_64/vpp-lib-18.01.1-release.x86_64.rpm' -'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/18.01.1-release.x86_64/vpp-api-python-18.01.1-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp/18.04-release.x86_64/vpp-18.04-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-plugins/18.04-release.x86_64/vpp-plugins-18.04-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-lib/18.04-release.x86_64/vpp-lib-18.04-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-api-python/18.04-release.x86_64/vpp-api-python-18.04-release.x86_64.rpm' +'https://nexus.fd.io/content/repositories/fd.io.centos7/io/fd/vpp/vpp-selinux-policy/18.04-release.x86_64/vpp-selinux-policy-18.04-release.x86_64.rpm' ) CENTOS_UPDATE="http://artifacts.opnfv.org/apex/fraser/centos" |