Remove references to CBS -testing repo

We no longer frequently update the CentOS Community Build System
-testing repository. Instead, we use the fully-automated devel repos on
ODL's Nexus. Remove docs about it, as want to try to deprecate it in the
next few releases.

Keeping old example repo config files as they may be used by lots of old
code, should likely be preserved long-term.

Change-Id: I2cc60c2ec63a5e9fa9419d63c7ddc7568fa9195b
Jira: INTPAK-182
Signed-off-by: Daniel Farrell <dfarrell@redhat.com>

diff --git a/docs/packaging-releases.rst b/docs/packaging-releases.rst
index 663448483d2373e829c11f48ca07a22f9362e56a..d634cdede803bfa6c51e1588b8b7688d0b988b8b 100644 (file)
--- a/docs/packaging-releases.rst
+++ b/docs/packaging-releases.rst
@@ -45,9 +45,10 @@ you'll also need to add the package to the tag.
 
 Releases should typically be tagged to three related tags.
 
-* Testing tag for this major version
+* Candidate tag for this major version
 
-    cbs tag-build nfv7-opendaylight-8-testing opendaylight-8.1.0-1.el7
+    cbs add-pkg nfv7-opendaylight-8-candidate opendaylight --owner=dfarrell07
+    cbs tag-build nfv7-opendaylight-8-candidate opendaylight-8.1.0-1.el7
 
 * Release tag for this major.minor version
 
@@ -58,23 +59,17 @@ Releases should typically be tagged to three related tags.
 
     cbs tag-build nfv7-opendaylight-8-release opendaylight-8.1.0-1.el7
 
-It may be advisable to fully do the testing tag first, and only once everything
+It may be advisable to fully do the candidate tag first, and only once everything
 is verified working do the release tags.
 
 Wait for the repository to regenerate and show the new package.
 
-http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/x86_64/os/Packages/
+http://cbs.centos.org/repos/nfv7-opendaylight-8-candidate/x86_64/os/Packages/
 
 Once the RPM is available on the CBS, test it with the test-rpm-master job.
 
 https://jenkins.opendaylight.org/releng/job/packaging-test-rpm-master/
 
-If everything passes, link the main downloads documentation to the RPM in the
-major.minor release repository. This is the permanent home for this version,
-will not be overridden by later versions.
-
-http://docs.opendaylight.org/en/latest/downloads.html
-
 Updating Docs
 -------------
 

diff --git a/docs/rpms.rst b/docs/rpms.rst
index 4a7262d5c0c2e01943a64c2ab1d13657cd26eecd..a218a3927e3bb7e6006122b5e8abac60e47d3ff6 100644 (file)
--- a/docs/rpms.rst
+++ b/docs/rpms.rst
@@ -104,20 +104,6 @@ There are a series of repos that are updated at varying frequencies, from
 testing repos that are updated with pre-release versions very frequently to
 release repos that are the permanent home of official OpenDaylight releases.
 
-Testing Repositories
-....................
-
-Repositories with the -testing suffix are updated very frequently with
-pre-release versions of OpenDaylight from the appropriate branch. New RPMs
-replace the old ones, so installing from these repos will always provide the
-most recent versions.
-
-Testing repos for Carbon, Nitrogen and Oxygen:
-
-- `nfv7-opendaylight-6-testing`_
-- `nfv7-opendaylight-7-testing`_
-- `nfv7-opendaylight-8-testing`_
-
 Release Repositories
 ....................
 
@@ -157,8 +143,8 @@ Package managers like Yum and DNF will automatically find repo configuration
 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=packages/rpm/example_repo_configs/opendaylight-8-devel.repo"
+    sudo curl -o /etc/yum.repos.d/opendaylight-9-devel.repo \
+      "https://git.opendaylight.org/gerrit/gitweb?p=integration/packaging.git;a=blob_plain;f=packages/rpm/example_repo_configs/opendaylight-9-devel.repo"
 
 Standard install commands will now find the repository as expected.
 
@@ -186,9 +172,6 @@ as an RPM. See the `packaging-build-rpm`_ section for docs.
 .. _opendaylight-carbon-epel-7-x86_64-devel: https://nexus.opendaylight.org/content/repositories/opendaylight-carbon-epel-7-x86_64-devel/org/opendaylight/integration-packaging/opendaylight/
 .. _opendaylight-nitrogen-epel-7-x86_64-devel: https://nexus.opendaylight.org/content/repositories/opendaylight-nitrogen-epel-7-x86_64-devel/org/opendaylight/integration-packaging/opendaylight/
 .. _opendaylight-oxygen-epel-7-x86_64-devel: https://nexus.opendaylight.org/content/repositories/opendaylight-oxygen-epel-7-x86_64-devel/org/opendaylight/integration-packaging/opendaylight/
-.. _nfv7-opendaylight-6-testing: http://cbs.centos.org/repos/nfv7-opendaylight-6-testing/x86_64/os/Packages/
-.. _nfv7-opendaylight-7-testing: http://cbs.centos.org/repos/nfv7-opendaylight-7-testing/x86_64/os/Packages/
-.. _nfv7-opendaylight-8-testing: http://cbs.centos.org/repos/nfv7-opendaylight-8-testing/x86_64/os/Packages/
 .. _nfv7-opendaylight-6-release: http://cbs.centos.org/repos/nfv7-opendaylight-6-release/x86_64/os/Packages/
 .. _nfv7-opendaylight-60-release: http://cbs.centos.org/repos/nfv7-opendaylight-60-release/x86_64/os/Packages/
 .. _nfv7-opendaylight-61-release: http://cbs.centos.org/repos/nfv7-opendaylight-61-release/x86_64/os/Packages/

diff --git a/packages/rpm/README.markdown b/packages/rpm/README.markdown
index 9ee7498cb262f6b23c05a4a8cece005a80334006..4470427c597aee81772596501397f2f22c92051d 100644 (file)
--- a/packages/rpm/README.markdown
+++ b/packages/rpm/README.markdown
@@ -395,7 +395,7 @@ You can monitor the build using the Koji CLI `watch-logs` and `watch-task`
 commands, or the [Koji web UI's][1] output of the same information.
 
 If the RPM build is successful, it will appear [on the CBS][9] under the
-appropriate `nfv7-opendaylight-<major version>-testing` repo. The resulting
+appropriate `nfv7-opendaylight-<major version>` repo. The resulting
 RPM can be installed directly or via a [package manager config file][10].
 
 ```

diff --git a/packages/rpm/example_repo_configs/README.markdown b/packages/rpm/example_repo_configs/README.markdown
index addd93940e743e6bd3779f0d8d66a483ec1e0f56..bd9c98adb109b4a0547cabe6425ee272ac57edf7 100644 (file)
--- a/packages/rpm/example_repo_configs/README.markdown
+++ b/packages/rpm/example_repo_configs/README.markdown
@@ -1,16 +1,7 @@
 ### Example Repository Configurations
 
 The repository configuration files in this directory provide examples
-of the configurations required for installing OpenDaylight from the CentOS
-Community Build System, where its source RPM (via `../build.sh`) is built
-in a standard environment and hosted for distribution.
+of the configurations required for installing OpenDaylight.
 
-These repository configurations tell your package manager, like `yum`,
-the details required for installing OpenDaylight from the CBS.
-
-We will eventually use the `-testing-`, `-canidate-` and `-release-` tags to
-control the verbosity of our updates (infrequent stable releases vs frequent
-CI/CD/CR). For now, we are just using the `-canidate-` tag.
-
-We will also eventually sign our RPMs, at which point we will enable GPG
-checks via the `gpgcheck` repo config variable.
+We would like to sign our RPMs and enable GPG checks via the `gpgcheck` repo
+config variable. If you'd like to contribute this, see INTPAK-71.