From d7c4f5f3f11197be00260327d64d376b77057ecd Mon Sep 17 00:00:00 2001 From: Daniel Farrell Date: Tue, 22 Aug 2017 09:26:42 -0400 Subject: [PATCH] Update RPM repo cfg file URL Recent refactoring in Int/Pack changed the path, update accordingly. Change-Id: Ifcfad2ebf5f413987109bb2cdd19830f3ede80f5 Signed-off-by: Daniel Farrell --- docs/rpms.rst | 4 ++-- packages/rpm/README.markdown | 2 +- packer/vars/opendaylight-3.4.0.json | 2 +- packer/vars/opendaylight-4.0.0.json | 2 +- packer/vars/opendaylight-4.1.0.json | 2 +- packer/vars/opendaylight-4.2.0.json | 2 +- packer/vars/opendaylight-4.3.0.json | 2 +- packer/vars/opendaylight-4.4.0.json | 2 +- packer/vars/opendaylight-5.0.0.json | 2 +- packer/vars/opendaylight-5.1.0.json | 2 +- packer/vars/opendaylight-5.2.0.json | 2 +- packer/vars/opendaylight-5.3.0.json | 2 +- packer/vars/opendaylight-5.4.0.json | 2 +- packer/vars/opendaylight-6.0.0.json | 2 +- packer/vars/opendaylight-6.1.0.json | 2 +- tutorials/l2switch/Vagrantfile | 2 +- 16 files changed, 17 insertions(+), 17 deletions(-) diff --git a/docs/rpms.rst b/docs/rpms.rst index 28d75f6..644abd0 100644 --- a/docs/rpms.rst +++ b/docs/rpms.rst @@ -124,7 +124,7 @@ files placed in the /etc/yum.repos.d/ directory. Curl them into place with something like: sudo curl -o /etc/yum.repos.d/opendaylight-7-testing.repo \ - "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-7-testing.repo" + "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-7-testing.repo" Standard install commands will now find the repository as expected. @@ -156,5 +156,5 @@ as an RPM. See the `packaging-build-rpm`_ section for docs. .. _nfv7-opendaylight-52-release: http://cbs.centos.org/repos/nfv7-opendaylight-52-release/x86_64/os/Packages/ .. _nfv7-opendaylight-53-release: http://cbs.centos.org/repos/nfv7-opendaylight-53-release/x86_64/os/Packages/ .. _nfv7-opendaylight-60-release: http://cbs.centos.org/repos/nfv7-opendaylight-60-release/x86_64/os/Packages/ -.. _example repo config files for each official repository: https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=tree;f=rpm/example_repo_configs;hb=refs/heads/master +.. _example repo config files for each official repository: https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=tree;f=packages/rpm/example_repo_configs;hb=refs/heads/master .. _integration-multipatch-test: https://jenkins.opendaylight.org/releng/search/?q=integration-multipatch-test diff --git a/packages/rpm/README.markdown b/packages/rpm/README.markdown index 457de2b..dc50e8b 100644 --- a/packages/rpm/README.markdown +++ b/packages/rpm/README.markdown @@ -453,7 +453,7 @@ other tools used by [Int/Pack][15], like Packer, Ansible and Puppet. [9]: http://cbs.centos.org/repos/ -[10]: https://github.com/opendaylight/integration-packaging/tree/master/rpm/example_repo_configs +[10]: https://github.com/opendaylight/integration-packaging/tree/master/packages/rpm/example_repo_configs [11]: https://bugs.centos.org/view.php?id=9098#c23768 diff --git a/packer/vars/opendaylight-3.4.0.json b/packer/vars/opendaylight-3.4.0.json index 9eee5fe..76bcdfb 100644 --- a/packer/vars/opendaylight-3.4.0.json +++ b/packer/vars/opendaylight-3.4.0.json @@ -1,4 +1,4 @@ { "odl_version": "3.4.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-34-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-34-release.repo'" } diff --git a/packer/vars/opendaylight-4.0.0.json b/packer/vars/opendaylight-4.0.0.json index b656107..e3ce311 100644 --- a/packer/vars/opendaylight-4.0.0.json +++ b/packer/vars/opendaylight-4.0.0.json @@ -1,4 +1,4 @@ { "odl_version": "4.0.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-40-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-40-release.repo'" } diff --git a/packer/vars/opendaylight-4.1.0.json b/packer/vars/opendaylight-4.1.0.json index b748422..902e712 100644 --- a/packer/vars/opendaylight-4.1.0.json +++ b/packer/vars/opendaylight-4.1.0.json @@ -1,4 +1,4 @@ { "odl_version": "4.1.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-41-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-41-release.repo'" } diff --git a/packer/vars/opendaylight-4.2.0.json b/packer/vars/opendaylight-4.2.0.json index 4022ff8..fb3838e 100644 --- a/packer/vars/opendaylight-4.2.0.json +++ b/packer/vars/opendaylight-4.2.0.json @@ -1,4 +1,4 @@ { "odl_version": "4.2.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-42-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-42-release.repo'" } diff --git a/packer/vars/opendaylight-4.3.0.json b/packer/vars/opendaylight-4.3.0.json index 1dc2913..45a8318 100644 --- a/packer/vars/opendaylight-4.3.0.json +++ b/packer/vars/opendaylight-4.3.0.json @@ -1,4 +1,4 @@ { "odl_version": "4.3.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-43-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-43-release.repo'" } diff --git a/packer/vars/opendaylight-4.4.0.json b/packer/vars/opendaylight-4.4.0.json index 06254dc..4115c8e 100644 --- a/packer/vars/opendaylight-4.4.0.json +++ b/packer/vars/opendaylight-4.4.0.json @@ -1,4 +1,4 @@ { "odl_version": "4.4.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-44-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-44-release.repo'" } diff --git a/packer/vars/opendaylight-5.0.0.json b/packer/vars/opendaylight-5.0.0.json index 98a84bd..fcf59fa 100644 --- a/packer/vars/opendaylight-5.0.0.json +++ b/packer/vars/opendaylight-5.0.0.json @@ -1,4 +1,4 @@ { "odl_version": "5.0.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-50-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-50-release.repo'" } diff --git a/packer/vars/opendaylight-5.1.0.json b/packer/vars/opendaylight-5.1.0.json index c5f749e..242dbda 100644 --- a/packer/vars/opendaylight-5.1.0.json +++ b/packer/vars/opendaylight-5.1.0.json @@ -1,4 +1,4 @@ { "odl_version": "5.1.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-51-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-51-release.repo'" } diff --git a/packer/vars/opendaylight-5.2.0.json b/packer/vars/opendaylight-5.2.0.json index 1146e82..d66d64a 100644 --- a/packer/vars/opendaylight-5.2.0.json +++ b/packer/vars/opendaylight-5.2.0.json @@ -1,4 +1,4 @@ { "odl_version": "5.2.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-52-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-52-release.repo'" } diff --git a/packer/vars/opendaylight-5.3.0.json b/packer/vars/opendaylight-5.3.0.json index ebb521f..616cb7f 100644 --- a/packer/vars/opendaylight-5.3.0.json +++ b/packer/vars/opendaylight-5.3.0.json @@ -1,4 +1,4 @@ { "odl_version": "5.3.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-53-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-53-release.repo'" } diff --git a/packer/vars/opendaylight-5.4.0.json b/packer/vars/opendaylight-5.4.0.json index 557a916..23239f9 100644 --- a/packer/vars/opendaylight-5.4.0.json +++ b/packer/vars/opendaylight-5.4.0.json @@ -1,4 +1,4 @@ { "odl_version": "5.4.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-54-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-54-release.repo'" } diff --git a/packer/vars/opendaylight-6.0.0.json b/packer/vars/opendaylight-6.0.0.json index 5c8203b..3cbaad7 100644 --- a/packer/vars/opendaylight-6.0.0.json +++ b/packer/vars/opendaylight-6.0.0.json @@ -1,4 +1,4 @@ { "odl_version": "6.0.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-60-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-60-release.repo'" } diff --git a/packer/vars/opendaylight-6.1.0.json b/packer/vars/opendaylight-6.1.0.json index d231f06..58545fe 100644 --- a/packer/vars/opendaylight-6.1.0.json +++ b/packer/vars/opendaylight-6.1.0.json @@ -1,4 +1,4 @@ { "odl_version": "6.1.0", - "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-61-release.repo'" + "rpm_repo_url": "'https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-61-release.repo'" } diff --git a/tutorials/l2switch/Vagrantfile b/tutorials/l2switch/Vagrantfile index e52bef0..210d7b1 100644 --- a/tutorials/l2switch/Vagrantfile +++ b/tutorials/l2switch/Vagrantfile @@ -31,7 +31,7 @@ Vagrant.configure(VAGRANTFILE_API_VERSION) do |config| # Add ODL RPM repo config to correct location in box filesystem # Repo configs are provided by upstream OpenDaylight Integration/Packaging - l2switch.vm.provision "shell", inline: "curl --silent -o /etc/yum.repos.d/opendaylight-6-release.repo \"https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=rpm/example_repo_configs/opendaylight-6-release.repo;hb=refs/heads/master\"" + l2switch.vm.provision "shell", inline: "curl --silent -o /etc/yum.repos.d/opendaylight-6-release.repo \"https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-6-release.repo;hb=refs/heads/master\"" # Install ODL using the RPM repo config added above l2switch.vm.provision "shell", inline: "dnf install -y opendaylight" -- 2.36.6