Merge "Fix podman and buildah only on rhel-8.2"

This commit is contained in:
Zuul 2020-09-03 20:09:03 +00:00 committed by Gerrit Code Review
commit ff730321a2
2 changed files with 28 additions and 2 deletions

View File

@ -0,0 +1,26 @@
---
# Copyright 2019 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.
_tripleo_podman_packages:
- podman-1.6.4
_tripleo_buildah_packages:
- buildah-1.11.6
_tripleo_podman_purge_packages:
- docker
- docker-ce

View File

@ -16,10 +16,10 @@
_tripleo_podman_packages: _tripleo_podman_packages:
- podman-1.6.4 - podman
_tripleo_buildah_packages: _tripleo_buildah_packages:
- buildah-1.11.6 - buildah
_tripleo_podman_purge_packages: _tripleo_podman_purge_packages:
- docker - docker