.ostc-ci,docs: rename to Oniro Project

The .ostc-ci directory becomes .oniro-ci

The various CI variables names are now all uniformly named CI_ONIRO_.
Some specific variables were further trimmed to avoid using "CI" twice.

Remaining uses of OSTC and OHOS are for URLs, container images and
branch names.

Signed-off-by: Zygmunt Krynicki <zygmunt.krynicki@huawei.com>

.ostc-ci/gitlab-ci.yml → .oniro-ci/gitlab-ci.yml

@@ -27,15 +27,15 @@ include:
     - 'dco.yaml'
     - 'reuse.yaml'
  - project: 'OSTC/OHOS/manifest'
-   file: '.ostc-ci/build-generic.yaml'
+   file: '.oniro-ci/build-generic.yaml'
  - project: 'OSTC/OHOS/manifest'
-   file: '.ostc-ci/test-generic.yaml'
+   file: '.oniro-ci/test-generic.yaml'
 # By default, the CI pipeline is invoked using an explicit git ref (branch
 # name) in the manifest. This include is a HACK to allow the CI pipeline to get
 # changes to the machine-and-flavours.yaml picked up directly from the incoming
 # branch in the merge request instead of the explicit branch name in the
 # manifest.
- - local: '/.ostc-ci/machines-and-flavours.yaml'
+ - local: '/.oniro-ci/machines-and-flavours.yaml'
 
 dco:
   extends: .dco
@@ -57,7 +57,7 @@ aggregate-docs:
 # incoming changes that match the repository holding this CI pipeline.
 .workspace:
   variables:
-    OHOS_CI_GIT_REPO_PATH: sources/meta-ohos
+    CI_ONIRO_GIT_REPO_PATH: sources/meta-ohos
 
 # Customize the .bitbake-workspace job to set the rules governing when a build
 # is attempted to: modifications (changes) to the pipeline, meta-layers,

.ostc-ci/machines-and-flavours.yaml → .oniro-ci/machines-and-flavours.yaml

@@ -14,9 +14,9 @@ linux-qemu-x86:
   extends: .build-wic-image
   variables:
     MACHINE: qemux86
-    OHOS_BUILD_FLAVOUR: linux
-    OHOS_RECIPE_NAME: oniro-image-base-tests
-    # Set OHOS_BUILD_CACHE to "pub", overriding the value defined in the
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
+    # Set CI_ONIRO_BUILD_CACHE to "pub", overriding the value defined in the
     # .build job. This enables sharing of download and sstate-cache created
     # during this job.
     #
@@ -24,18 +24,18 @@ linux-qemu-x86:
     # tainted build intermediate files, downloads or published artifacts. All
     # the non-tainted builds help to populate a cache exposed at
     # https://cache.ostc-eu.org/bitbake
-    OHOS_BUILD_CACHE: "pub"
-    OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
+    CI_ONIRO_BUILD_CACHE: "pub"
+    CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
 
 linux-qemu-x86_64:
   extends: .build-wic-image
   variables:
     MACHINE: qemux86-64
-    OHOS_BUILD_FLAVOUR: linux
-    OHOS_RECIPE_NAME: oniro-image-base-tests
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
     # See the note on linux-qemu-x86.
-    OHOS_BUILD_CACHE: "pub"
-    OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
+    CI_ONIRO_BUILD_CACHE: "pub"
+    CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
 
 linux-seco-intel-b68:
   extends: .build-linux-matrix
@@ -47,56 +47,56 @@ linux-seco-imx8mm-c61:
   variables:
     MACHINE: seco-imx8mm-c61
     # This platform requires proprietary resources to boot.
-    # See build-generic.yaml for explanation of OHOS_BB_LOCAL_CONF_ variables.
-    OHOS_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
+    # See build-generic.yaml for explanation of CI_ONIRO_BB_LOCAL_CONF_ variables.
+    CI_ONIRO_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
 
 linux-stm32mp1-av96:
   extends: .build-recipe
   variables:
-    OHOS_BUILD_FLAVOUR: linux
-    OHOS_RECIPE_NAME: oniro-image-base-tests
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
     MACHINE: stm32mp1-av96
 
 linux-raspberrypi4-64:
   extends: .build-wic-image
   variables:
     MACHINE: raspberrypi4-64
-    OHOS_BUILD_FLAVOUR: linux
-    OHOS_RECIPE_NAME: oniro-image-base-tests
+    CI_ONIRO_BUILD_FLAVOUR: linux
+    CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
 
 zephyr-qemu-x86:
   extends: .build-image
   variables:
     MACHINE: qemu-x86
     # See the note on linux-qemu-x86.
-    OHOS_BUILD_CACHE: "pub"
-    OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
-    OHOS_RECIPE_NAME: zephyr-philosophers
-    OHOS_BUILD_FLAVOUR: zephyr
+    CI_ONIRO_BUILD_CACHE: "pub"
+    CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
+    CI_ONIRO_RECIPE_NAME: zephyr-philosophers
+    CI_ONIRO_BUILD_FLAVOUR: zephyr
 
 zephyr-qemu-cortex-m3:
   extends: .build-image
   variables:
     MACHINE: qemu-cortex-m3
     # See the note on linux-qemu-x86.
-    OHOS_BUILD_CACHE: "pub"
-    OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
-    OHOS_RECIPE_NAME: zephyr-philosophers
-    OHOS_BUILD_FLAVOUR: zephyr
+    CI_ONIRO_BUILD_CACHE: "pub"
+    CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
+    CI_ONIRO_RECIPE_NAME: zephyr-philosophers
+    CI_ONIRO_BUILD_FLAVOUR: zephyr
 
 zephyr-96b-nitrogen:
   extends: .build-image
   variables:
     MACHINE: 96b-nitrogen
-    OHOS_RECIPE_NAME: zephyr-philosophers
-    OHOS_BUILD_FLAVOUR: zephyr
+    CI_ONIRO_RECIPE_NAME: zephyr-philosophers
+    CI_ONIRO_BUILD_FLAVOUR: zephyr
 
 zephyr-96b-nitrogen-tests:
   extends: .build-image
   variables:
     MACHINE: 96b-nitrogen
-    OHOS_RECIPE_NAME: zephyr-kernel-test-all
-    OHOS_BUILD_FLAVOUR: zephyr
+    CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-all
+    CI_ONIRO_BUILD_FLAVOUR: zephyr
 
 zephyr-96b-avenger:
   extends: .build-zephyr
@@ -120,28 +120,28 @@ freertos-armv5:
   variables:
     MACHINE: qemuarmv5
     # See the note on linux-qemu-x86.
-    OHOS_BUILD_CACHE: "pub"
-    OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
+    CI_ONIRO_BUILD_CACHE: "pub"
+    CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
 
 blueprint-smartpanel-zephyr:
   extends: .build-zephyr
   variables:
     MACHINE: 96b-nitrogen
     DISTRO: oniro-zephyr-blueprint-dashboard
-    OHOS_BITBAKE_TARGETS: "zephyr-blueprint-smarthome-sensors zephyr-blueprint-smarthome-switch"
+    CI_ONIRO_BITBAKE_TARGETS: "zephyr-blueprint-smarthome-sensors zephyr-blueprint-smarthome-switch"
 
 blueprint-smartpanel-linux:
   extends: .build-linux
-  tags: [large-disk, bitbake-friendly, heavy, $OHOS_RUNNER_TAG]
+  tags: [large-disk, bitbake-friendly, heavy, $CI_ONIRO_RUNNER_TAG]
   variables:
     MACHINE: stm32mp1-av96
     DISTRO: oniro-linux-blueprint-dashboard
-    OHOS_BITBAKE_TARGETS: "blueprint-dashboard-gateway-image"
+    CI_ONIRO_BITBAKE_TARGETS: "blueprint-dashboard-gateway-image"
 
 blueprint-gateway-linux:
   extends: .build-linux
-  tags: [large-disk, bitbake-friendly, heavy, $OHOS_RUNNER_TAG]
+  tags: [large-disk, bitbake-friendly, heavy, $CI_ONIRO_RUNNER_TAG]
   variables:
     MACHINE: raspberrypi4-64
     DISTRO: oniro-linux-blueprint-gateway
-    OHOS_BITBAKE_TARGETS: "blueprint-gateway-image"
+    CI_ONIRO_BITBAKE_TARGETS: "blueprint-gateway-image"

docs/ci/machines-and-flavours.rst

@@ -21,9 +21,10 @@ linux-qemu-x86
 ..............
 
 This job extends `.build-linux` job from the manifest repository and builds
-``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using
-the Linux flavour of |main_project_name| and ``MACHINE=qemux86``. This job checks that
-|main_project_name| software can be built for a basic 32bit x86 virtual machine.
+``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
+flavour of |main_project_name| and ``MACHINE=qemux86``. This job checks that
+|main_project_name| software can be built for a basic 32bit x86 virtual
+machine.
 
 The cache for this job is publicly available.
 
@@ -31,9 +32,10 @@ linux-qemu-x86_64
 .................
 
 This job extends `.build-linux` job from the manifest repository and builds
-``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using
-the Linux flavour of |main_project_name| and ``MACHINE=qemux86-64``. This job checks that
-|main_project_name| software can be built for a basic 64bit x86 virtual machine.
+``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
+flavour of |main_project_name| and ``MACHINE=qemux86-64``. This job checks that
+|main_project_name| software can be built for a basic 64bit x86 virtual
+machine.
 
 The cache for this job is publicly available.
 
@@ -41,9 +43,9 @@ linux-seco-intel-b68
 ....................
 
 This job extends `.build-linux` job from the manifest repository and builds
-``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using
-the Linux flavour of |main_project_name| and ``MACHINE=seco-intel-b68``. This job
-checks that |main_project_name| software can be built for the SECO B68 development
+``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
+flavour of |main_project_name| and ``MACHINE=seco-intel-b68``. This job checks
+that |main_project_name| software can be built for the SECO B68 development
 board, which contains an Intel x86_64 SoC.
 
 .. note::
@@ -54,9 +56,9 @@ linux-seco-imx8mm-c61
 .....................
 
 This job extends `.build-linux` job from the manifest repository and builds
-``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using
-the Linux flavour of |main_project_name| and ``MACHINE=seco-imx8mm-c61``. This job
-checks that |main_project_name| software can be built for the SECO C61 development
+``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
+flavour of |main_project_name| and ``MACHINE=seco-imx8mm-c61``. This job checks
+that |main_project_name| software can be built for the SECO C61 development
 board, which contains the NXP i.MX 8M Mini SoC, which implements 64bit ARMv8
 architecture.
 
@@ -68,11 +70,11 @@ linux-stm32mp1-av96
 ...................
 
 This job extends `.build-linux` job from the manifest repository and builds
-``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using
-the Linux flavour of |main_project_name| and ``MACHINE=stm32mp1-av96``. This job checks
-that |main_project_name| software can be built for the 96Boards Avenger development
-board, which contains the STM32MP157 SoC, which implements 32bit ARMv7
-architecture.
+``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
+flavour of |main_project_name| and ``MACHINE=stm32mp1-av96``. This job checks
+that |main_project_name| software can be built for the 96Boards Avenger
+development board, which contains the STM32MP157 SoC, which implements 32bit
+ARMv7 architecture.
 
 .. note::
     The cache for this job is not public, pending legal review of any firmware
@@ -82,9 +84,9 @@ linux-raspberrypi4-64
 .....................
 
 This job extends `.build-linux` job from the manifest repository and builds
-``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using
-the Linux flavour of |main_project_name| and ``MACHINE=raspberrypi4-64``. This job
-checks that |main_project_name| software can be built for the Raspberry Pi 4B
+``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
+flavour of |main_project_name| and ``MACHINE=raspberrypi4-64``. This job checks
+that |main_project_name| software can be built for the Raspberry Pi 4B
 development board, which contains the BCM2711 SoC, which implements 64bit ARMv8
 architecture.