From 83ed53f5eee2c431828e616e0c9e90291d455b98 Mon Sep 17 00:00:00 2001 From: Cristovao Cordeiro Date: Thu, 7 Dec 2023 16:29:09 +0100 Subject: [PATCH] chore: rename ROCKs to rocks --- rockcraft/__init__.py | 2 +- rockcraft/commands/init.py | 8 ++++---- rockcraft/layers.py | 2 +- rockcraft/models/project.py | 18 +++++++++--------- rockcraft/oci.py | 14 +++++++------- rockcraft/pebble.py | 2 +- rockcraft/plugins/python_plugin.py | 4 ++-- rockcraft/services/package.py | 2 +- setup.cfg | 2 +- snap/snapcraft.yaml | 2 +- tests/spread/general/bare-base/rockcraft.yaml | 4 ++-- tests/spread/general/big/rockcraft.yaml | 4 ++-- tests/spread/general/big/task.yaml | 4 ++-- tests/spread/general/chisel/rockcraft.yaml | 4 ++-- tests/spread/general/chisel/task.yaml | 2 +- tests/spread/general/clean/rockcraft.yaml | 4 ++-- .../spread/general/destructive/rockcraft.yaml | 4 ++-- .../general/entrypoint-service/rockcraft.yaml | 4 ++-- .../spread/general/environment/rockcraft.yaml | 2 +- .../general/health-checks/rockcraft.yaml | 4 ++-- .../general/invalid-name/rockcraft.orig.yaml | 4 ++-- tests/spread/general/invalid-name/task.yaml | 4 ++-- tests/spread/general/plugin-go/rockcraft.yaml | 2 +- .../spread/general/plugin-python-3.6/task.yaml | 4 ++-- tests/spread/general/plugin-python/parts.yaml | 4 ++-- tests/spread/general/plugin-python/task.yaml | 2 +- tests/spread/general/prune/task.yaml | 2 +- .../general/repo-bare-base/rockcraft.yaml | 4 ++-- .../general/repo-ubuntu-base/rockcraft.yaml | 4 ++-- tests/spread/general/run-user/rockcraft.yaml | 4 ++-- .../usrmerge-file-collision/rockcraft.yaml | 4 ++-- .../general/usrmerge-file-collision/task.yaml | 2 +- tests/spread/general/usrmerge/rockcraft.yaml | 4 ++-- tests/unit/test_application.py | 2 +- tests/unit/test_project.py | 6 +++--- 35 files changed, 72 insertions(+), 72 deletions(-) diff --git a/rockcraft/__init__.py b/rockcraft/__init__.py index 551634dc4..5c850cc00 100644 --- a/rockcraft/__init__.py +++ b/rockcraft/__init__.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -"""The craft tool to create ROCKs.""" +"""The craft tool to create rocks.""" try: from ._version import __version__ diff --git a/rockcraft/commands/init.py b/rockcraft/commands/init.py index 08077fe09..a64eef69b 100644 --- a/rockcraft/commands/init.py +++ b/rockcraft/commands/init.py @@ -63,17 +63,17 @@ class InitCommand(AppCommand): _INIT_TEMPLATE_YAML = textwrap.dedent( """\ - name: my-rock-name # the name of your ROCK - base: ubuntu@22.04 # the base environment for this ROCK + name: my-rock-name # the name of your rock + base: ubuntu@22.04 # the base environment for this rock version: '0.1' # just for humans. Semantic versioning is recommended - summary: Single-line elevator pitch for your amazing ROCK # 79 char long summary + summary: Single-line elevator pitch for your amazing rock # 79 char long summary description: | This is my my-rock-name's description. You have a paragraph or two to tell the most important story about it. Keep it under 100 words though, we live in tweetspace and your description wants to look good in the container registries out there. license: GPL-3.0 # your application's SPDX license - platforms: # The platforms this ROCK should be built on and run on + platforms: # The platforms this rock should be built on and run on amd64: parts: diff --git a/rockcraft/layers.py b/rockcraft/layers.py index 2c6fae7d9..db79ac025 100644 --- a/rockcraft/layers.py +++ b/rockcraft/layers.py @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see . -"""Handling of files and directories for ROCKs image layers.""" +"""Handling of files and directories for rocks image layers.""" import os import tarfile from collections import defaultdict diff --git a/rockcraft/models/project.py b/rockcraft/models/project.py index 7529327f9..accbd37a8 100644 --- a/rockcraft/models/project.py +++ b/rockcraft/models/project.py @@ -71,7 +71,7 @@ def _validate_platform_set(cls, values: Mapping[str, Any]) -> Mapping[str, Any]: if len(build_for) > 1: raise CraftValidationError( str( - f"Trying to build a ROCK for {build_for} " + f"Trying to build a rock for {build_for} " "but multiple target architectures are not " "currently supported. Please specify only 1 value." ) @@ -88,7 +88,7 @@ def _validate_platform_set(cls, values: Mapping[str, Any]) -> Mapping[str, Any]: NAME_REGEX = r"^([a-z](?:-?[a-z0-9]){2,})$" """ -The regex for valid names for ROCKs. It matches the accepted values for pebble +The regex for valid names for rocks. It matches the accepted values for pebble layer files: - must start with a lowercase letter [a-z] @@ -99,14 +99,14 @@ def _validate_platform_set(cls, values: Mapping[str, Any]) -> Mapping[str, Any]: """ INVALID_NAME_MESSAGE = ( - "Invalid name for ROCK (must contain only lowercase letters, numbers and hyphens)" + "Invalid name for rock (must contain only lowercase letters, numbers and hyphens)" ) DEPRECATED_COLON_BASES = ["ubuntu:20.04", "ubuntu:22.04"] class NameStr(pydantic.ConstrainedStr): - """Constrained string type only accepting valid ROCK names.""" + """Constrained string type only accepting valid rock names.""" regex = re.compile(NAME_REGEX) @@ -158,7 +158,7 @@ def _check_unsupported_options(cls, values: Mapping[str, Any]) -> Mapping[str, A # pylint: disable=unused-argument unsupported_msg = str( "The fields 'entrypoint', 'cmd' and 'env' are not supported in " - "Rockcraft. All ROCKs have Pebble as their entrypoint, so you must " + "Rockcraft. All rocks have Pebble as their entrypoint, so you must " "use 'services' to define your container application and " "respective environment." ) @@ -186,7 +186,7 @@ def _validate_license(cls, rock_license: str) -> str: @pydantic.validator("title", always=True) @classmethod def _validate_title(cls, title: str | None, values: Mapping[str, Any]) -> str: - """If title is not provided, it defaults to the provided ROCK name.""" + """If title is not provided, it defaults to the provided rock name.""" if not title: title = values.get("name", "") return cast(str, title) @@ -271,7 +271,7 @@ def _validate_all_platforms(cls, platforms: dict[str, Any]) -> dict[str, Any]: if not any(b_o in SUPPORTED_ARCHS for b_o in build_on_one_of): raise CraftValidationError( str( - f"{error_prefix}: trying to build ROCK in one of " + f"{error_prefix}: trying to build rock in one of " f"{build_on_one_of}, but none of these build architectures is supported. " f"Supported architectures: {list(SUPPORTED_ARCHS.keys())}" ) @@ -280,7 +280,7 @@ def _validate_all_platforms(cls, platforms: dict[str, Any]) -> dict[str, Any]: if build_target not in SUPPORTED_ARCHS: raise CraftValidationError( str( - f"{error_prefix}: trying to build ROCK for target " + f"{error_prefix}: trying to build rock for target " f"architecture {build_target}, which is not supported. " f"Supported architectures: {list(SUPPORTED_ARCHS.keys())}" ) @@ -397,7 +397,7 @@ def _repr_str(dumper, data): def generate_metadata( self, generation_time: str, base_digest: bytes ) -> tuple[dict, dict]: - """Generate the ROCK's metadata (both the OCI annotation and internal metadata. + """Generate the rock's metadata (both the OCI annotation and internal metadata. :param generation_time: the UTC time at the time of calling this method :param base_digest: digest of the base image diff --git a/rockcraft/oci.py b/rockcraft/oci.py index 8c39c8ed6..eeb1bddcb 100644 --- a/rockcraft/oci.py +++ b/rockcraft/oci.py @@ -224,11 +224,11 @@ def add_user( username: str, uid: int, ) -> None: - """Create a new ROCK user. + """Create a new rock user. :param prime_dir: Path to the user-defined parts' primed content. :param base_layer_dir: Path to the base layer's root filesystem. - :param tag: The ROCK's image tag. + :param tag: The rock's image tag. :param username: Username to be created. Same as group name. :param uid: UID of the username to be created. Same as GID. """ @@ -401,8 +401,8 @@ def set_pebble_layer( :param services: The Pebble services :param checks: The Pebble checks - :param name: The name of the ROCK - :param tag: The ROCK's image tag + :param name: The name of the rock + :param tag: The rock's image tag :param summary: The summary for the Pebble layer :param description: The description for the Pebble layer :param base_layer_dir: Path to the base layer's root filesystem @@ -452,15 +452,15 @@ def set_environment(self, env: dict[str, str]) -> None: emit.progress(f"Environment set to {env_list}") def set_control_data(self, metadata: dict[str, Any]) -> None: - """Create and populate the ROCK's control data folder. + """Create and populate the rock's control data folder. - :param metadata: content for the ROCK's metadata YAML file + :param metadata: content for the rock's metadata YAML file """ emit.progress("Setting the rock's control data") local_control_data_path = Path(tempfile.mkdtemp()) - # the ROCK control data structure starts with the folder ".rock" + # the rock control data structure starts with the folder ".rock" control_data_rock_folder = local_control_data_path / ".rock" control_data_rock_folder.mkdir() diff --git a/rockcraft/pebble.py b/rockcraft/pebble.py index b71982ad0..87df04a97 100644 --- a/rockcraft/pebble.py +++ b/rockcraft/pebble.py @@ -185,7 +185,7 @@ def define_pebble_layer( :param target_dir: Path where to write the new Pebble layer file :param ref_fs: filesystem to use as a reference when inferring the layer name :param layer_content: the actual Pebble layer, in JSON - :param rock_name: name of the ROCK where the layer will end up + :param rock_name: name of the rock where the layer will end up """ # NOTE: the layer's filename prefix will always be "001-" when using # "bare" and "ubuntu" bases diff --git a/rockcraft/plugins/python_plugin.py b/rockcraft/plugins/python_plugin.py index b8425ce48..aaf2a4075 100644 --- a/rockcraft/plugins/python_plugin.py +++ b/rockcraft/plugins/python_plugin.py @@ -59,7 +59,7 @@ class PythonPlugin(python_plugin.PythonPlugin): """A Python plugin for Rockcraft. This plugin extends Craft-parts' vanilla Python plugin to properly - set the Python interpreter according to the ROCK's base. Specifically: + set the Python interpreter according to the rock's base. Specifically: - If the base is ubuntu, the venv-created symlinks in bin/ are removed altogether. This is because of the usrmerge; when the layer is added on @@ -108,7 +108,7 @@ def get_build_commands(self) -> list[str]: commands.extend(super().get_build_commands()) # Add a "sitecustomize.py" module to handle the very common case of the - # ROCK's interpreter being called as "python3"; in this case, because of + # rock's interpreter being called as "python3"; in this case, because of # the default $PATH, "/usr/bin/python3" ends up being called and that is # *not* the venv-aware executable. This sitecustomize adds the location # of the pip-installed packages. diff --git a/rockcraft/services/package.py b/rockcraft/services/package.py index 59957b94a..fcc727491 100644 --- a/rockcraft/services/package.py +++ b/rockcraft/services/package.py @@ -68,7 +68,7 @@ def pack(self, prime_dir: pathlib.Path, dest: pathlib.Path) -> list[pathlib.Path if platform is None: # This should only happen in destructive mode, in which case we - # can only pack a single ROCK. + # can only pack a single rock. build_on = util.get_host_architecture() base_build_plan = self._project.get_build_plan() build_plan = [ diff --git a/setup.cfg b/setup.cfg index 135ed889a..b245518db 100644 --- a/setup.cfg +++ b/setup.cfg @@ -1,7 +1,7 @@ [metadata] name = rockcraft version = attr: rockcraft.__version__ -description="Create ROCKS" +description="Create rocks" long_description = file: README.rst url = https://github.com/canonical/rockcraft project_urls = diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml index 9bf05c61f..3ce1c95cf 100644 --- a/snap/snapcraft.yaml +++ b/snap/snapcraft.yaml @@ -1,6 +1,6 @@ name: rockcraft base: core22 -summary: A craft like experience to create ROCKS +summary: A craft like experience to create rockS description: | Rockcraft aims to take the same primitives used in Charmcraft and Snapcraft to create OCI images. diff --git a/tests/spread/general/bare-base/rockcraft.yaml b/tests/spread/general/bare-base/rockcraft.yaml index cf02e947f..fc7ae24ad 100644 --- a/tests/spread/general/bare-base/rockcraft.yaml +++ b/tests/spread/general/bare-base/rockcraft.yaml @@ -1,7 +1,7 @@ name: bare-base-test version: latest -summary: A tiny ROCK -description: Building a tiny ROCK from a bare base, with just one package +summary: A tiny rock +description: Building a tiny rock from a bare base, with just one package license: Apache-2.0 build-base: ubuntu@22.04 base: bare diff --git a/tests/spread/general/big/rockcraft.yaml b/tests/spread/general/big/rockcraft.yaml index d0cd87a28..5570edf69 100644 --- a/tests/spread/general/big/rockcraft.yaml +++ b/tests/spread/general/big/rockcraft.yaml @@ -1,8 +1,8 @@ name: big version: latest -summary: A big ROCK to test many features +summary: A big rock to test many features description: | - A big ROCK whose purpose is to test many features while only paying the "setup" + A big rock whose purpose is to test many features while only paying the "setup" and "teardown" price once. Feel free to add to this file and to "task.yaml", adding references to issues/PRs where appropriate. license: Apache-2.0 diff --git a/tests/spread/general/big/task.yaml b/tests/spread/general/big/task.yaml index a52273150..b2e4daf13 100644 --- a/tests/spread/general/big/task.yaml +++ b/tests/spread/general/big/task.yaml @@ -26,7 +26,7 @@ execute: | docker images - # Check the ROCK's output + # Check the rock's output docker run --rm big:latest | MATCH "/tmp" ############################################################################################ @@ -57,7 +57,7 @@ execute: | ############################################################################################ # This check documents the fact that we currently don't preserve/observe symlinks between - # layers - we only take the base on which the ROCK was built into account. If the behavior + # layers - we only take the base on which the rock was built into account. If the behavior # changes, this check will break and then can be removed/updated. ############################################################################################ docker run --rm big exec readlink /.rock | NOMATCH fake_rock_dir diff --git a/tests/spread/general/chisel/rockcraft.yaml b/tests/spread/general/chisel/rockcraft.yaml index 0dd12ace8..ea391783e 100644 --- a/tests/spread/general/chisel/rockcraft.yaml +++ b/tests/spread/general/chisel/rockcraft.yaml @@ -1,6 +1,6 @@ name: chiseled-dotnet -summary: A "bare" ROCK containing the .NET runtime -description: A "bare" ROCK containing the .NET runtime +summary: A "bare" rock containing the .NET runtime +description: A "bare" rock containing the .NET runtime license: Apache-2.0 version: "0.0.1" diff --git a/tests/spread/general/chisel/task.yaml b/tests/spread/general/chisel/task.yaml index 9d1867982..2e905301a 100644 --- a/tests/spread/general/chisel/task.yaml +++ b/tests/spread/general/chisel/task.yaml @@ -1,4 +1,4 @@ -summary: a test that checks ROCKs created with Chisel slices +summary: a test that checks rocks created with Chisel slices execute: | run_rockcraft pack diff --git a/tests/spread/general/clean/rockcraft.yaml b/tests/spread/general/clean/rockcraft.yaml index 061142057..20198a522 100644 --- a/tests/spread/general/clean/rockcraft.yaml +++ b/tests/spread/general/clean/rockcraft.yaml @@ -1,8 +1,8 @@ name: clean base: ubuntu@22.04 version: '0.1' -summary: A minimal hello world ROCK -description: A minimal hello world ROCK +summary: A minimal hello world rock +description: A minimal hello world rock license: GPL-3.0 platforms: amd64: diff --git a/tests/spread/general/destructive/rockcraft.yaml b/tests/spread/general/destructive/rockcraft.yaml index a76f992d8..260b6767b 100644 --- a/tests/spread/general/destructive/rockcraft.yaml +++ b/tests/spread/general/destructive/rockcraft.yaml @@ -1,7 +1,7 @@ name: destructive-mode version: latest -summary: A destructively-built ROCK -description: Building a ROCK in destructive mode +summary: A destructively-built rock +description: Building a rock in destructive mode license: Apache-2.0 build-base: ubuntu:22.04 # Leaving ":"-notation on purpose here base: bare diff --git a/tests/spread/general/entrypoint-service/rockcraft.yaml b/tests/spread/general/entrypoint-service/rockcraft.yaml index 74f35eac5..a9264a767 100644 --- a/tests/spread/general/entrypoint-service/rockcraft.yaml +++ b/tests/spread/general/entrypoint-service/rockcraft.yaml @@ -1,8 +1,8 @@ name: entrypoint-service-test version: latest base: ubuntu@22.04 -summary: A ROCK with an entrypoint-service field -description: A ROCK with an entrypoint-service field +summary: A rock with an entrypoint-service field +description: A rock with an entrypoint-service field license: Apache-2.0 entrypoint-service: test-service services: diff --git a/tests/spread/general/environment/rockcraft.yaml b/tests/spread/general/environment/rockcraft.yaml index 64da79e9d..0eb9fc353 100644 --- a/tests/spread/general/environment/rockcraft.yaml +++ b/tests/spread/general/environment/rockcraft.yaml @@ -2,7 +2,7 @@ name: environment-test version: latest base: ubuntu@20.04 summary: Environment -description: A ROCK with an environment but no real purpose +description: A rock with an environment but no real purpose license: Apache-2.0 environment: FOO: bar diff --git a/tests/spread/general/health-checks/rockcraft.yaml b/tests/spread/general/health-checks/rockcraft.yaml index 562815209..f59a43db1 100644 --- a/tests/spread/general/health-checks/rockcraft.yaml +++ b/tests/spread/general/health-checks/rockcraft.yaml @@ -1,6 +1,6 @@ name: healthy-rock -summary: A ROCK with health checks -description: A test ROCK with a bunch of different Pebble checks +summary: A rock with health checks +description: A test rock with a bunch of different Pebble checks license: Apache-2.0 version: latest diff --git a/tests/spread/general/invalid-name/rockcraft.orig.yaml b/tests/spread/general/invalid-name/rockcraft.orig.yaml index 2d9f12491..85131e28b 100644 --- a/tests/spread/general/invalid-name/rockcraft.orig.yaml +++ b/tests/spread/general/invalid-name/rockcraft.orig.yaml @@ -1,8 +1,8 @@ name: placeholder-name base: ubuntu@22.04 version: '0.1' -summary: A ROCK with an invalid name -description: A ROCK with an invalid name +summary: A rock with an invalid name +description: A rock with an invalid name license: GPL-3.0 platforms: amd64: diff --git a/tests/spread/general/invalid-name/task.yaml b/tests/spread/general/invalid-name/task.yaml index c44d99b56..9b64999c0 100644 --- a/tests/spread/general/invalid-name/task.yaml +++ b/tests/spread/general/invalid-name/task.yaml @@ -1,8 +1,8 @@ -summary: check that invalid ROCK names are blocked +summary: check that invalid rock names are blocked execute: | for name in a_a a@a a--a aa- do sed "s/placeholder-name/$name/" rockcraft.orig.yaml > rockcraft.yaml - rockcraft pack 2>&1 >/dev/null | MATCH "Invalid name for ROCK" + rockcraft pack 2>&1 >/dev/null | MATCH "Invalid name for rock" done \ No newline at end of file diff --git a/tests/spread/general/plugin-go/rockcraft.yaml b/tests/spread/general/plugin-go/rockcraft.yaml index e03c43b1d..2d3e83fb4 100644 --- a/tests/spread/general/plugin-go/rockcraft.yaml +++ b/tests/spread/general/plugin-go/rockcraft.yaml @@ -1,5 +1,5 @@ name: go-pebble -summary: A ROCK built with go +summary: A rock built with go description: The go version used does not interfere with the one used for pebble license: Apache-2.0 diff --git a/tests/spread/general/plugin-python-3.6/task.yaml b/tests/spread/general/plugin-python-3.6/task.yaml index faaeaa4f1..0ffaa2bc4 100644 --- a/tests/spread/general/plugin-python-3.6/task.yaml +++ b/tests/spread/general/plugin-python-3.6/task.yaml @@ -1,4 +1,4 @@ -summary: Build ROCKs with Python 3.6 with bases bare and ubuntu@20.04 +summary: Build rocks with Python 3.6 with bases bare and ubuntu@20.04 environment: BASE/base_2004: "ubuntu@20.04" BASE/bare: "bare" @@ -10,7 +10,7 @@ execute: | grep placeholder-base rockcraft.orig.yaml sed "s/placeholder-base/$BASE/" rockcraft.orig.yaml > rockcraft.yaml - # Build the ROCK & load it into docker + # Build the rock & load it into docker run_rockcraft pack ROCK=$(ls ./*.rock) sudo /snap/rockcraft/current/bin/skopeo --insecure-policy copy oci-archive:"${ROCK}" docker-daemon:${IMAGE} diff --git a/tests/spread/general/plugin-python/parts.yaml b/tests/spread/general/plugin-python/parts.yaml index 77684e9cf..65b0dede4 100644 --- a/tests/spread/general/plugin-python/parts.yaml +++ b/tests/spread/general/plugin-python/parts.yaml @@ -4,8 +4,8 @@ # main task.yaml). version: '0.1' -summary: A ROCK that bundles a Python project. -description: A ROCK that bundles a Python project. +summary: A rock that bundles a Python project. +description: A rock that bundles a Python project. license: GPL-3.0 platforms: amd64: diff --git a/tests/spread/general/plugin-python/task.yaml b/tests/spread/general/plugin-python/task.yaml index 8866dfd30..fca5194cc 100644 --- a/tests/spread/general/plugin-python/task.yaml +++ b/tests/spread/general/plugin-python/task.yaml @@ -18,7 +18,7 @@ execute: | # copy the Python source of the project we're building (also shared) cp -r ../src . - # Build the ROCK & load it into docker + # Build the rock & load it into docker run_rockcraft pack test -f ${ROCK_FILE} sudo /snap/rockcraft/current/bin/skopeo --insecure-policy copy oci-archive:${ROCK_FILE} docker-daemon:${IMAGE} diff --git a/tests/spread/general/prune/task.yaml b/tests/spread/general/prune/task.yaml index 4a66f0b2d..615270a5d 100644 --- a/tests/spread/general/prune/task.yaml +++ b/tests/spread/general/prune/task.yaml @@ -5,7 +5,7 @@ execute: | test -f ./*.rock - # Unpack the ROCK and verify that the lifecycle-based layer has no files in + # Unpack the rock and verify that the lifecycle-based layer has no files in # common with the base Ubuntu layer. tar -xf ./*.rock python3 check_layers.py ./*.rock diff --git a/tests/spread/general/repo-bare-base/rockcraft.yaml b/tests/spread/general/repo-bare-base/rockcraft.yaml index 4076d32de..0a110db25 100644 --- a/tests/spread/general/repo-bare-base/rockcraft.yaml +++ b/tests/spread/general/repo-bare-base/rockcraft.yaml @@ -1,7 +1,7 @@ name: apt-repo-static-test version: latest -summary: A ROCK that pulls in a package from an external PPA -description: A ROCK that pulls in a package from an external PPA +summary: A rock that pulls in a package from an external PPA +description: A rock that pulls in a package from an external PPA license: Apache-2.0 base: bare build-base: ubuntu@20.04 diff --git a/tests/spread/general/repo-ubuntu-base/rockcraft.yaml b/tests/spread/general/repo-ubuntu-base/rockcraft.yaml index 12bad1663..c3845384c 100644 --- a/tests/spread/general/repo-ubuntu-base/rockcraft.yaml +++ b/tests/spread/general/repo-ubuntu-base/rockcraft.yaml @@ -1,7 +1,7 @@ name: apt-repo-test version: latest -summary: A ROCK that pulls in a package from an external PPA -description: A ROCK that pulls in a package from an external PPA +summary: A rock that pulls in a package from an external PPA +description: A rock that pulls in a package from an external PPA license: Apache-2.0 base: ubuntu@22.04 diff --git a/tests/spread/general/run-user/rockcraft.yaml b/tests/spread/general/run-user/rockcraft.yaml index 1c03db75b..6b38b1325 100644 --- a/tests/spread/general/run-user/rockcraft.yaml +++ b/tests/spread/general/run-user/rockcraft.yaml @@ -1,7 +1,7 @@ name: run-user-test version: latest -summary: A ROCK with a nonroot user -description: A ROCK that has a nonroot default OCI user +summary: A rock with a nonroot user +description: A rock that has a nonroot default OCI user license: Apache-2.0 base: ubuntu@22.04 run-user: _daemon_ diff --git a/tests/spread/general/usrmerge-file-collision/rockcraft.yaml b/tests/spread/general/usrmerge-file-collision/rockcraft.yaml index 756a62af5..69b647848 100644 --- a/tests/spread/general/usrmerge-file-collision/rockcraft.yaml +++ b/tests/spread/general/usrmerge-file-collision/rockcraft.yaml @@ -1,7 +1,7 @@ name: usrmerge version: latest -summary: A ROCK that tests file conflicts in usrmerge handling. -description: A ROCK that tests file conflicts in usrmerge handling +summary: A rock that tests file conflicts in usrmerge handling. +description: A rock that tests file conflicts in usrmerge handling license: Apache-2.0 base: ubuntu@22.04 platforms: diff --git a/tests/spread/general/usrmerge-file-collision/task.yaml b/tests/spread/general/usrmerge-file-collision/task.yaml index 0357bdad6..5e72474f5 100644 --- a/tests/spread/general/usrmerge-file-collision/task.yaml +++ b/tests/spread/general/usrmerge-file-collision/task.yaml @@ -15,6 +15,6 @@ execute: | docker images usrmerge:latest ############################################################################################ - # check that usr/lib/x86_64-linux-gnu/rock-libexpat.so.1 was successfully packed into the ROCK + # check that usr/lib/x86_64-linux-gnu/rock-libexpat.so.1 was successfully packed into the rock ############################################################################################ docker run --rm usrmerge exec ls /usr/lib/x86_64-linux-gnu/rock-libexpat.so.1 diff --git a/tests/spread/general/usrmerge/rockcraft.yaml b/tests/spread/general/usrmerge/rockcraft.yaml index 0cb855d02..77c2f5c19 100644 --- a/tests/spread/general/usrmerge/rockcraft.yaml +++ b/tests/spread/general/usrmerge/rockcraft.yaml @@ -1,7 +1,7 @@ name: usrmerge version: latest -summary: A ROCK that tests usrmerge handling. -description: A ROCK that tests usrmerge handling +summary: A rock that tests usrmerge handling. +description: A rock that tests usrmerge handling license: Apache-2.0 base: ubuntu@22.04 platforms: diff --git a/tests/unit/test_application.py b/tests/unit/test_application.py index 8aa650946..adc4919d7 100644 --- a/tests/unit/test_application.py +++ b/tests/unit/test_application.py @@ -22,7 +22,7 @@ version: 2.0 base: ubuntu:20.04 summary: Environment -description: A ROCK with an environment but no real purpose +description: A rock with an environment but no real purpose license: Apache-2.0 environment: FOO: bar diff --git a/tests/unit/test_project.py b/tests/unit/test_project.py index fbe7af98d..b681622b3 100644 --- a/tests/unit/test_project.py +++ b/tests/unit/test_project.py @@ -188,7 +188,7 @@ def test_project_unmarshal_with_unsupported_fields(unsupported_field, yaml_loade _ = Project.unmarshal(loaded_data_with_unsupported_fields) assert ( - "All ROCKs have Pebble as their entrypoint, so you must use " + "All rocks have Pebble as their entrypoint, so you must use " "'services' to define your container application" in str(err.value) ) @@ -263,7 +263,7 @@ def test_project_title_empty_invalid_name(yaml_loaded_data): yaml_loaded_data["name"] = "my@rock" with pytest.raises(CraftValidationError) as err: load_project_yaml(yaml_loaded_data) - assert "Invalid name for ROCK" in str(err.value) + assert "Invalid name for rock" in str(err.value) @pytest.mark.parametrize("entrypoint_service", [""]) @@ -407,7 +407,7 @@ def reload_project_platforms(new_platforms=None): mock_platforms = { "mock": {"build-on": ["arm64a", "arm64"], "build-for": ["noarch"]} } - assert "build ROCK for target architecture noarch" in reload_project_platforms( + assert "build rock for target architecture noarch" in reload_project_platforms( mock_platforms )