Merge pull request #131 from bluesliverx/main

Simplify env var name to just ARCH

README.rst

@@ -319,8 +319,8 @@ Buildrunner injects special environment variables and volume mounts into every
 run container. The following environment variables are set and available in
 every run container:
 
-:``BUILDRUNNER_ARCHITECTURE``: the architecture of the current device (x86_64, aarch64, etc), equivalent to ``platform.machine()``
-:``BUILDRUNNER_PLATFORM``: (Deprecated, will be removed in favor of ``BUILDRUNNER_ARCHITECTURE``) the platform of the current device (x86_64, aarch64, etc), equivalent to ``platform.machine()``
+:``BUILDRUNNER_ARCH``: the architecture of the current device (x86_64, aarch64, etc), equivalent to ``platform.machine()``
+:``BUILDRUNNER_PLATFORM``: (Deprecated, will be removed in favor of ``BUILDRUNNER_ARCH``) the platform of the current device (x86_64, aarch64, etc), equivalent to ``platform.machine()``
 :``BUILDRUNNER_BUILD_NUMBER``: the build number
 :``BUILDRUNNER_BUILD_ID``: a unique id identifying the build (includes vcs and build number
                            information), e.g. "main-1791.Ia09cc5.M0-1661374484"

buildrunner/config/__init__.py

@@ -178,7 +178,7 @@ def _get_config_context(
         """
 
         context = {
-            "BUILDRUNNER_ARCHITECTURE": str(platform.machine()),
+            "BUILDRUNNER_ARCH": str(platform.machine()),
             "BUILDRUNNER_BUILD_NUMBER": str(build_number),
             "BUILDRUNNER_BUILD_ID": str(build_id),
             "BUILDRUNNER_BUILD_DOCKER_TAG": str(self.default_tag),

tests/test-files/test-general.yaml

@@ -150,5 +150,5 @@ steps:
   test-architecture:
     run:
       image: {{ DOCKER_REGISTRY }}/centos:8
-      cmd: 'if [ -z "{{ BUILDRUNNER_ARCHITECTURE }}" ]; then exit 1; else echo "Architecture is {{ BUILDRUNNER_ARCHITECTURE }}"; fi'
+      cmd: 'if [ -z "{{ BUILDRUNNER_ARCH }}" ]; then exit 1; else echo "Architecture is {{ BUILDRUNNER_ARCH }}"; fi'