diff options
| author |   Bartek Grzybowski <b.grzybowski@partner.samsung.com> | 2021-10-01 09:59:31 +0000 |
|---|---|---|
| committer |   Gerrit Code Review <gerrit@onap.org> | 2021-10-01 09:59:31 +0000 |
| commit | 6df828a11cf31250d62b2303251c8f32059fe4fe (patch) | |
| tree | e8d8a8a63e83f12555252d6f3f76f36fc2339f8f /ansible/test | |
| parent | a94408a888e32c83d24b2b3e697fe9906afb3eb9 (diff) | |
| parent | 632891dd505db333ac3ee401eb9eb1a9431d5d60 (diff) | |
Merge changes from topic "rhel79-upgrade"
* changes:
[DOC] Update Rhel/Centos version in docs to 7.9
[ANSIBLE] Disable DNS management in Network Manager only if it's installed
[CICDANSIBLE] Update heat template "image_name" parameter description
[MOLECULE] Upgrade roles tests image to Centos7.9
[MOLECULE] Upgrade playbook tests image to Centos7.9
[BUILD] Run Centos7.9 docker image for rpm download
Diffstat (limited to 'ansible/test')
6 files changed, 12 insertions, 12 deletions
diff --git a/ansible/test/images/docker/centos7/build.sh b/ansible/test/images/docker/centos7/build.sh index dede5215..05d28c12 100755 --- a/ansible/test/images/docker/centos7/build.sh +++ b/ansible/test/images/docker/centos7/build.sh @@ -2,7 +2,7 @@ # COPYRIGHT NOTICE STARTS HERE -# Copyright 2018 © Samsung Electronics Co., Ltd. +# Copyright 2021 © Samsung Electronics Co., Ltd. # # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -19,5 +19,5 @@ # COPYRIGHT NOTICE ENDS HERE set -e -TAG=${1:-centos7.6} +TAG=${1:-centos7.9} docker build . -t molecule-centos:${TAG} diff --git a/ansible/test/play-infrastructure/molecule/default/molecule.yml b/ansible/test/play-infrastructure/molecule/default/molecule.yml index 6aea7a37..c39c8621 100644 --- a/ansible/test/play-infrastructure/molecule/default/molecule.yml +++ b/ansible/test/play-infrastructure/molecule/default/molecule.yml @@ -10,7 +10,7 @@ lint: | flake8 platforms: - name: infrastructure-server - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false @@ -25,7 +25,7 @@ platforms: purge_networks: true - name: kubernetes-node-1 - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false diff --git a/ansible/test/play-resources/molecule/default/molecule.yml b/ansible/test/play-resources/molecule/default/molecule.yml index 5c7dbd54..eaa42bc9 100644 --- a/ansible/test/play-resources/molecule/default/molecule.yml +++ b/ansible/test/play-resources/molecule/default/molecule.yml @@ -10,7 +10,7 @@ lint: | flake8 platforms: - name: resource-host - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false @@ -22,7 +22,7 @@ platforms: - name: resource-data - name: infrastructure-server - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false diff --git a/ansible/test/play-resources/molecule/nfs/molecule.yml b/ansible/test/play-resources/molecule/nfs/molecule.yml index 25a14065..bb040a57 100644 --- a/ansible/test/play-resources/molecule/nfs/molecule.yml +++ b/ansible/test/play-resources/molecule/nfs/molecule.yml @@ -10,7 +10,7 @@ lint: | flake8 platforms: - name: resource-host - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false @@ -23,7 +23,7 @@ platforms: - name: resource-data - name: infrastructure-server - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false diff --git a/ansible/test/play-rke/molecule/default/molecule.yml b/ansible/test/play-rke/molecule/default/molecule.yml index 13fe96b9..39945a25 100644 --- a/ansible/test/play-rke/molecule/default/molecule.yml +++ b/ansible/test/play-rke/molecule/default/molecule.yml @@ -10,7 +10,7 @@ lint: | flake8 platforms: - name: infrastructure-server - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false @@ -20,7 +20,7 @@ platforms: - kubernetes-control-plane - kubernetes - name: kubernetes-node-1 - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false diff --git a/ansible/test/play-rke/molecule/helm3/molecule.yml b/ansible/test/play-rke/molecule/helm3/molecule.yml index 13fe96b9..39945a25 100644 --- a/ansible/test/play-rke/molecule/helm3/molecule.yml +++ b/ansible/test/play-rke/molecule/helm3/molecule.yml @@ -10,7 +10,7 @@ lint: | flake8 platforms: - name: infrastructure-server - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false @@ -20,7 +20,7 @@ platforms: - kubernetes-control-plane - kubernetes - name: kubernetes-node-1 - image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.6} + image: molecule-${PREBUILD_PLATFORM_DISTRO:-centos}:${PREBUILD_DISTRO_VERSION:-centos7.9} pre_build_image: true privileged: true override_command: false |