Rename 'baseimage' profile to 'container'

Signed-off-by: Rafael Santos <rdossant@redhat.com>
This commit is contained in:
Rafael Santos 2017-05-17 08:50:05 +02:00
commit 385c64243b
4 changed files with 11 additions and 11 deletions

View file

@ -19,7 +19,7 @@ data:
documentation: https://github.com/fedora-modularity/base-runtime
tracker: https://github.com/fedora-modularity/base-runtime/issues
profiles:
baseimage:
container:
rpms:
- bash
- coreutils-single

View file

@ -6,7 +6,7 @@ service:
port:
packages:
profiles:
- baseimage
- container
rpms:
default_module: docker
module:

View file

@ -64,12 +64,12 @@ class BaseRuntimeSetupDocker(module_framework.CommonFunctions, Test):
if "profiles" not in mod_yaml["data"].keys():
self.error("'profiles' key was not found in 'data' section")
if "baseimage" not in mod_yaml["data"]["profiles"].keys():
self.error("'baseimage' key was not found in 'profiles' section")
if "container" not in mod_yaml["data"]["profiles"].keys():
self.error("'container' key was not found in 'profiles' section")
base_profile = mod_yaml["data"]["profiles"]["baseimage"]
base_profile = mod_yaml["data"]["profiles"]["container"]
if "rpms" not in base_profile.keys():
self.error("'rpms' key was not found in 'baseimage' profile")
self.error("'rpms' key was not found in 'container' profile")
req_pkgs = base_profile["rpms"]
if not req_pkgs:

View file

@ -90,16 +90,16 @@ class BaseRuntimeSmokeTest(module_framework.AvocadoTest):
if "profiles" not in mod_yaml["data"].keys():
self.error("'profiles' key was not found in 'data' section")
if "baseimage" not in mod_yaml["data"]["profiles"].keys():
self.error("'baseimage' key was not found in 'profiles' section")
if "container" not in mod_yaml["data"]["profiles"].keys():
self.error("'container' key was not found in 'profiles' section")
base_profile = mod_yaml["data"]["profiles"]["baseimage"]
base_profile = mod_yaml["data"]["profiles"]["container"]
if "rpms" not in base_profile.keys():
self.error("'rpms' key was not found in 'baseimage' profile")
self.error("'rpms' key was not found in 'container' profile")
req_pkgs = base_profile["rpms"]
if not req_pkgs:
self.error("No rpm is defined for baseimage")
self.error("No rpm is defined for container")
installed_pkgs = self._get_all_installed_pkgs()