Enable fips test for collectd

Depends-On: Ie232bda79ca6b98abd37da586561912c2513b110
(cherry picked from commit d9b6e13ba6)
Change-Id: I42e9aa822982083be152765c517f8be108c46e99
This commit is contained in:
Chris Sibbitt 2021-09-28 15:00:12 -04:00
parent 24073667fa
commit a3950e46fc
10 changed files with 17 additions and 53 deletions

View File

@ -8,11 +8,11 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -8,11 +8,11 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -12,11 +12,11 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"
@ -37,7 +37,6 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro

View File

@ -1,36 +0,0 @@
# Molecule managed
# Copyright 2021 Red Hat, Inc.
# All Rights Reserved.
#
# Licensed under the Apache License, Version 2.0 (the "License"); you may
# not use this file except in compliance with the License. You may obtain
# a copy of the License at
#
# http://www.apache.org/licenses/LICENSE-2.0
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
# WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
# License for the specific language governing permissions and limitations
# under the License.
{% if item.registry is defined %}
FROM {{ item.registry.url }}/{{ item.image }}
{% else %}
FROM {{ item.image }}
{% endif %}
RUN if [ $(command -v apt-get) ]; then apt-get update && apt-get install -y python sudo bash ca-certificates && apt-get clean; \
elif [ $(command -v dnf) ]; then dnf makecache && dnf --assumeyes install sudo python*-devel python*-dnf bash {{ item.pkg_extras | default('') }} && dnf clean all; \
elif [ $(command -v yum) ]; then yum makecache fast && yum install -y python sudo yum-plugin-ovl python-setuptools bash {{ item.pkg_extras | default('') }} && sed -i 's/plugins=0/plugins=1/g' /etc/yum.conf && yum clean all; \
elif [ $(command -v zypper) ]; then zypper refresh && zypper install -y python sudo bash python-xml {{ item.pkg_extras | default('') }} && zypper clean -a; \
elif [ $(command -v apk) ]; then apk update && apk add --no-cache python sudo bash ca-certificates {{ item.pkg_extras | default('') }}; \
elif [ $(command -v xbps-install) ]; then xbps-install -Syu && xbps-install -y python sudo bash ca-certificates {{ item.pkg_extras | default('') }} && xbps-remove -O; fi
{% for pkg in item.easy_install | default([]) %}
# install pip for centos where there is no python-pip rpm in default repos
RUN easy_install {{ pkg }}
{% endfor %}
CMD ["sh", "-c", "while true; do sleep 10000; done"]

View File

@ -8,12 +8,12 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/pki/rpm-gpg:/etc/pki/rpm-gpg
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -8,11 +8,11 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -8,11 +8,11 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -8,11 +8,11 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -8,11 +8,11 @@ platforms:
image: centos/centos:stream8
registry:
url: quay.io
dockerfile: ../common/Dockerfile
pkg_extras: python*setuptools libselinux-python* policycoreutils-python-utils
volumes:
- /etc/ci/mirror_info.sh:/etc/ci/mirror_info.sh:ro
- /etc/dnf/vars:/etc/dnf/vars
# Had to comment this out or I get "No URLs in mirrorlist"
#- /etc/dnf/vars:/etc/dnf/vars
privileged: true
environment: &env
http_proxy: "{{ lookup('env', 'http_proxy') }}"

View File

@ -292,6 +292,7 @@
timeout: 7200
vars:
tripleo_role_name: tripleo_collectd
pre-run: zuul.d/playbooks/enable-fips.yml
- job:
files:
- ^tripleo_ansible/roles/tripleo_config/(?!meta).*