[container][latest] Rename and update barometer-collectd-latest

Collectd changed the upstream default to main, and Barometer added a few
changes to incorporate this. One change was renaming the
`barometer-collectd-master` container to `barometer-collectd-latest`, since
`barometer-collectd-main` didn't make sense semantically, as we use the
stable container as the "main" reference.

At the time, we didn't have the changes made in releng to build the new
container, so container renaming was paused.
Now that the change is merged in releng (and has been for a while), and
the containers are being updated, this change should happen, so that the
container gets published.

Signed-off-by: Emma Foley <efoley@redhat.com>
Change-Id: I4ee91c289b9e7477157bea148452be58343dc733

diff --git a/docker/README_collectd b/docker/README_collectd
index baa0ff6..cf49710 100644 (file)
--- a/docker/README_collectd
+++ b/docker/README_collectd
@@ -9,7 +9,7 @@ Table of content:
 1. DESCRIPTION
 2. SYSTEM REQUIREMENTS
 3. INSTALLATION NOTES - barometer-collectd
-4. INSTALLATION NOTES - barometer-collectd-master
+4. INSTALLATION NOTES - barometer-collectd-latest
 5. ADDITIONAL STEPS
 
 ------------------------------------------------------------------------------
@@ -18,7 +18,7 @@ Table of content:
 This Dockerfile provides instruction for building collect in isolated container.
 There are currently two variants of collectd container:
  - barometer-collectd - it is based on stable collect release
- - barometer-collectd-master - development container that is based on
+ - barometer-collectd-latest - development container that is based on
    latest 'main' branch for collectd project. It contains all available
    collectd plugins and features that are available on 'main' branch but
    some issues with configuration or stability may occur
@@ -46,22 +46,22 @@ sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs:/op
 /opt/collectd/sbin/collectd -f
 
 ------------------------------------------------------------------------------
-4. INSTALLATION NOTES: barometer-collectd-master (development container)
+4. INSTALLATION NOTES: barometer-collectd-latest (development container)
 
-To build docker barometer-collectd-master container run (it is based on main branch from collectd):
-sudo docker build -f ./docker/barometer-collectd-master/Dockerfile .
+To build docker barometer-collectd-latest container run (it is based on main branch from collectd):
+sudo docker build -f ./docker/barometer-collectd-latest/Dockerfile .
 from root barometer folder.
 
 To run builded image run
 sudo docker images # get docker image id
-sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \
+sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \
 -v /var/run:/var/run -v /tmp:/tmp --privileged <image id>
 
-NOTE: barometer-collectd-master container uses a different sample configurations files
-compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-master)
+NOTE: barometer-collectd-latest container uses a different sample configurations files
+compared to regular barometer-collectd container (src/collectd/collectd_sample_configs-latest)
 
 To make some changes run
-sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \
+sudo docker run -ti --net=host -v `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \
 -v /var/run:/var/run -v /tmp:/tmp --privileged --entrypoint=/bin/bash <image id>
 
 /opt/collectd/sbin/collectd -f

diff --git a/docker/barometer-collectd-master/Dockerfile b/docker/barometer-collectd-latest/Dockerfile
similarity index 70%
rename from docker/barometer-collectd-master/Dockerfile
rename to docker/barometer-collectd-latest/Dockerfile
index 9637a48..4c01c87 100644 (file)
--- a/docker/barometer-collectd-master/Dockerfile
+++ b/docker/barometer-collectd-latest/Dockerfile
@@ -13,17 +13,16 @@
 # limitations under the License.
 #
 
-FROM centos:7
-RUN yum update -y && \
-        yum install -y which sudo git && \
-        yum clean all && \
+FROM centos:8
+RUN dnf update -y && \
+        dnf install -y which sudo git && \
+        dnf clean all && \
         git config --global http.sslVerify false
 
 ENV DOCKER y
-ENV COLLECTD_FLAVOR master
+ENV COLLECTD_FLAVOR latest
 ENV WITH_DPDK y
 ENV repos_dir /src
-ENV openstack_plugins /src/barometer/src/collectd-openstack-plugins
 
 WORKDIR ${repos_dir}
 RUN mkdir -p ${repos_dir}/barometer
@@ -31,15 +30,11 @@ COPY . ${repos_dir}/barometer
 
 WORKDIR ${repos_dir}/barometer/systems
 RUN sh ./build_base_machine.sh && \
+        dnf clean all && rm -rf /var/cache/dnf && \
         useradd -ms /bin/bash collectd_exec && \
         echo "collectd_exec ALL=(ALL) NOPASSWD: ALL" >> /etc/sudoers
 
-WORKDIR ${openstack_plugins}
-RUN make && \
-        pip install --upgrade pip && \
-        pip install -r ${openstack_plugins}/collectd-openstack-plugins/requirements.txt
-
-COPY docker/barometer-collectd-master/run_collectd.sh /run_collectd.sh
+COPY docker/barometer-collectd-latest/run_collectd.sh /run_collectd.sh
 RUN chmod +x /run_collectd.sh
 
 ENTRYPOINT ["/run_collectd.sh"]

diff --git a/docker/barometer-collectd-master/run_collectd.sh b/docker/barometer-collectd-latest/run_collectd.sh
similarity index 100%
rename from docker/barometer-collectd-master/run_collectd.sh
rename to docker/barometer-collectd-latest/run_collectd.sh

diff --git a/docs/release/userguide/installguide.docker.rst b/docs/release/userguide/installguide.docker.rst
index 4f01630..2bb7941 100644 (file)
--- a/docs/release/userguide/installguide.docker.rst
+++ b/docs/release/userguide/installguide.docker.rst
@@ -269,7 +269,7 @@ Collectd-barometer flavors
 Before starting to build and run the Collectd container, understand the available
 flavors of Collectd containers:
   * barometer-collectd - stable release, based on collectd 5.11
-  * barometer-collectd-master - release based on collectd 'main' branch
+  * barometer-collectd-latest - release based on collectd 'main' branch
   * barometer-collectd-experimental - release based on collectd 'main'
     branch that also includes set of experimental (not yet merged into upstream)
     pull requests
@@ -280,7 +280,7 @@ flavors of Collectd containers:
 
 Stable `barometer-collectd` container is intended for work in production
 environment as it is based on latest collectd official release.
-`Barometer-collectd-master` and `barometer-collectd-experimental` containers
+`barometer-collectd-latest` and `barometer-collectd-experimental` containers
 can be used in order to try new collectd features.
 All flavors are located in `barometer` git repository - respective Dockerfiles
 are stored in subdirectories of `docker/` directory
@@ -291,7 +291,7 @@ are stored in subdirectories of `docker/` directory
     $ git clone https://gerrit.opnfv.org/gerrit/barometer
     $ ls barometer/docker|grep collectd
     barometer-collectd
-    barometer-collectd-master
+    barometer-collectd-latest
     barometer-collectd-experimental
 
 .. note::
@@ -338,23 +338,24 @@ Output should contain a barometer-collectd image:
    hello-world                  latest              05a3bd381fc2        4 weeks ago         1.84kB
 
 .. note::
-   If you do not plan to use collectd-master and collectd-experimental barometer
-   containers, then you can proceed directly to section `Run the collectd stable docker image`_
+   If you do not plan to use `barometer-collectd-latest` and
+   `barometer-collectd-experimental` containers, then you can proceed directly
+   to section `Run the collectd stable docker image`_
 
 
-Build collectd-master container
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+Build barometer-collectd-latest container
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 
 .. code:: bash
 
     $ cd <BAROMETER_REPO_DIR>
-    $ sudo docker build -t opnfv/barometer-collectd-master \
+    $ sudo docker build -t opnfv/barometer-collectd-latest \
      --build-arg http_proxy=`echo $http_proxy` \
      --build-arg https_proxy=`echo $https_proxy` --network=host -f \
-     docker/barometer-collectd-master/Dockerfile .
+     docker/barometer-collectd-latest/Dockerfile .
 
 .. note::
-   For `barometer-collectd-master` and `barometer-collectd-experimental` containers
+   For `barometer-collectd-latest` and `barometer-collectd-experimental` containers
    proxy parameters should be passed only if system is behind an HTTP or HTTPS
    proxy server (same as for stable collectd container)
 
@@ -370,7 +371,7 @@ Build collectd-experimental container
      --network=host -f docker/barometer-collectd-experimental/Dockerfile .
 
 .. note::
-   For `barometer-collectd-master` and `barometer-collectd-experimental` containers
+   For `barometer-collectd-latest` and `barometer-collectd-experimental` containers
    proxy parameters should be passed only if system is behind an HTTP or HTTPS
    proxy server (same as for stable collectd container)
 
@@ -429,26 +430,26 @@ To make some changes when the container is running run:
 
    sudo docker exec -ti <CONTAINER ID> /bin/bash
 
-Run the barometer-collectd-master docker image
+Run the barometer-collectd-latest docker image
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-Run command for `barometer-collectd-master` container is very similar to command
-used for stable container - the only differences are name of the image
-and location of the sample configuration files(as different version of collectd
-plugins requiring different configuration files)
+Run command for ``barometer-collectd-latest`` container is very similar to
+command used for stable container - the only differences are name of the image
+and location of the sample configuration files (as different version of
+collectd plugins requiring different configuration files)
 
 
 .. code:: bash
 
    $ cd <BAROMETER_REPO_DIR>
    $ sudo docker run -ti --net=host -v \
-   `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \
+   `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \
    -v /var/run:/var/run -v /tmp:/tmp -v /sys/fs/resctrl:/sys/fs/resctrl \
-   --privileged opnfv/barometer-collectd-master
+   --privileged opnfv/barometer-collectd-latest
 
 .. note::
    Barometer collectd docker images are sharing some directories with host
    (e.g. /tmp) therefore only one of collectd barometer flavors can be run
-   at a time. In other words, if you want to try `barometer-collectd-master` or
+   at a time. In other words, if you want to try `barometer-collectd-latest` or
    `barometer-collectd-experimental` image, please stop instance of
    `barometer-collectd(stable)` image first.
 
@@ -461,29 +462,29 @@ plugins requiring different configuration files)
 Run the barometer-collectd-experimental docker image
 ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
 Barometer-collectd-experimental container shares default configuration files
-with 'barometer-collectd-master' equivalent but some of experimental pull
+with 'barometer-collectd-latest' equivalent but some of experimental pull
 requests may require modified configuration. Additional configuration files that
 are required specifically by experimental container can be found in
 `docker/barometer-collectd-experimental/experimental-configs/`
 directory. Content of this directory (all \*.conf files) should be copied to
-`src/collectd/collectd_sample_configs-master` directory before first run of
+``src/collectd/collectd_sample_configs-latest`` directory before first run of
 experimental container.
 
 .. code:: bash
 
    $ cd <BAROMETER_REPO_DIR>
    $ cp docker/barometer-collectd-experimental/experimental-configs/*.conf \
-     src/collectd/collectd_sample_configs-master
+     src/collectd/collectd_sample_configs-latest
 
 When configuration files are up to date for experimental container, it can be
-launched using following command (almost identical to run-command for 'master'
+launched using following command (almost identical to run-command for ``latest``
 collectd container)
 
 .. code:: bash
 
    $ cd <BAROMETER_REPO_DIR>
    $ sudo docker run -ti --net=host -v \
-   `pwd`/src/collectd/collectd_sample_configs-master:/opt/collectd/etc/collectd.conf.d \
+   `pwd`/src/collectd/collectd_sample_configs-latest:/opt/collectd/etc/collectd.conf.d \
    -v /var/run:/var/run -v /tmp:/tmp -v /sys/fs/resctrl:/sys/fs/resctrl --privileged \
    opnfv/barometer-collectd-experimental
 

diff --git a/src/collectd/collectd_sample_configs-master/csv.conf b/src/collectd/collectd_sample_configs-latest/csv.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/csv.conf
rename to src/collectd/collectd_sample_configs-latest/csv.conf

diff --git a/src/collectd/collectd_sample_configs-master/default_plugins.conf b/src/collectd/collectd_sample_configs-latest/default_plugins.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/default_plugins.conf
rename to src/collectd/collectd_sample_configs-latest/default_plugins.conf

diff --git a/src/collectd/collectd_sample_configs-master/dpdkevents.conf b/src/collectd/collectd_sample_configs-latest/dpdkevents.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/dpdkevents.conf
rename to src/collectd/collectd_sample_configs-latest/dpdkevents.conf

diff --git a/src/collectd/collectd_sample_configs-master/dpdkstat.conf b/src/collectd/collectd_sample_configs-latest/dpdkstat.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/dpdkstat.conf
rename to src/collectd/collectd_sample_configs-latest/dpdkstat.conf

diff --git a/src/collectd/collectd_sample_configs-master/exec.conf b/src/collectd/collectd_sample_configs-latest/exec.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/exec.conf
rename to src/collectd/collectd_sample_configs-latest/exec.conf

diff --git a/src/collectd/collectd_sample_configs-master/hugepages.conf b/src/collectd/collectd_sample_configs-latest/hugepages.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/hugepages.conf
rename to src/collectd/collectd_sample_configs-latest/hugepages.conf

diff --git a/src/collectd/collectd_sample_configs-master/intel_pmu.conf b/src/collectd/collectd_sample_configs-latest/intel_pmu.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/intel_pmu.conf
rename to src/collectd/collectd_sample_configs-latest/intel_pmu.conf

diff --git a/src/collectd/collectd_sample_configs-master/kafka.conf b/src/collectd/collectd_sample_configs-latest/kafka.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/kafka.conf
rename to src/collectd/collectd_sample_configs-latest/kafka.conf

diff --git a/src/collectd/collectd_sample_configs-master/mcelog.conf b/src/collectd/collectd_sample_configs-latest/mcelog.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/mcelog.conf
rename to src/collectd/collectd_sample_configs-latest/mcelog.conf

diff --git a/src/collectd/collectd_sample_configs-master/network.conf b/src/collectd/collectd_sample_configs-latest/network.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/network.conf
rename to src/collectd/collectd_sample_configs-latest/network.conf

diff --git a/src/collectd/collectd_sample_configs-master/ovs_events.conf b/src/collectd/collectd_sample_configs-latest/ovs_events.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/ovs_events.conf
rename to src/collectd/collectd_sample_configs-latest/ovs_events.conf

diff --git a/src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh b/src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/ovs_pmd_stats.sh
rename to src/collectd/collectd_sample_configs-latest/ovs_pmd_stats.sh

diff --git a/src/collectd/collectd_sample_configs-master/ovs_stats.conf b/src/collectd/collectd_sample_configs-latest/ovs_stats.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/ovs_stats.conf
rename to src/collectd/collectd_sample_configs-latest/ovs_stats.conf

diff --git a/src/collectd/collectd_sample_configs-master/pcie_errors.conf b/src/collectd/collectd_sample_configs-latest/pcie_errors.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/pcie_errors.conf
rename to src/collectd/collectd_sample_configs-latest/pcie_errors.conf

diff --git a/src/collectd/collectd_sample_configs-master/prometheus.conf b/src/collectd/collectd_sample_configs-latest/prometheus.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/prometheus.conf
rename to src/collectd/collectd_sample_configs-latest/prometheus.conf

diff --git a/src/collectd/collectd_sample_configs-master/rdt.conf b/src/collectd/collectd_sample_configs-latest/rdt.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/rdt.conf
rename to src/collectd/collectd_sample_configs-latest/rdt.conf

diff --git a/src/collectd/collectd_sample_configs-master/snmp_agent.conf b/src/collectd/collectd_sample_configs-latest/snmp_agent.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/snmp_agent.conf
rename to src/collectd/collectd_sample_configs-latest/snmp_agent.conf

diff --git a/src/collectd/collectd_sample_configs-master/virt.conf b/src/collectd/collectd_sample_configs-latest/virt.conf
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/virt.conf
rename to src/collectd/collectd_sample_configs-latest/virt.conf

diff --git a/src/collectd/collectd_sample_configs-master/write_notification.sh b/src/collectd/collectd_sample_configs-latest/write_notification.sh
similarity index 100%
rename from src/collectd/collectd_sample_configs-master/write_notification.sh
rename to src/collectd/collectd_sample_configs-latest/write_notification.sh

diff --git a/src/package-list.mk b/src/package-list.mk
index ec64df1..59e9a0a 100644 (file)
--- a/src/package-list.mk
+++ b/src/package-list.mk
@@ -22,7 +22,7 @@ COLLECTD_URL ?= https://github.com/collectd/collectd
 
 # there are 3 collectd flavors:
 # -"stable" - based on stable collectd release
-# -"master" - development version, based on main branch
+# -"latest" - development version, based on main branch
 # -"experimental" - it is based on main branch as above and includes
 #                   set pull requests with experimental features
 ifeq ($(COLLECTD_FLAVOR), stable)
@@ -30,10 +30,10 @@ ifeq ($(COLLECTD_FLAVOR), stable)
        COLLECTD_TAG ?= collectd-5.12
        SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs
 else
-# 'master' and 'experimental' collectd flavors are both using
+# 'latest' and 'experimental' collectd flavors are both using
 # code from main branch
        COLLECTD_TAG ?= main
-       SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-master
+       SAMPLE_CONF_VARIANT_NAME = collectd_sample_configs-latest
 ifeq ($(COLLECTD_FLAVOR), experimental)
 # 'experimental' flavor is using additional Pull Requests that
 # are put on top of main release