Skip to content
Snippets Groups Projects
Commit c0587d88 authored by Zygmunt Krynicki's avatar Zygmunt Krynicki
Browse files

.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: default avatarZygmunt Krynicki <zygmunt.krynicki@huawei.com>
parent 575a7222
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
.ostc-ci/gitlab-ci.yml → .oniro-ci/gitlab-ci.yml
+ 4
− 4
View file @ c0587d88
...@@ -27,15 +27,15 @@ include: ...@@ -27,15 +27,15 @@ include:
- 'dco.yaml' - 'dco.yaml'
- 'reuse.yaml' - 'reuse.yaml'
- project: 'OSTC/OHOS/manifest' - project: 'OSTC/OHOS/manifest'
file: '.ostc-ci/build-generic.yaml' file: '.oniro-ci/build-generic.yaml'
- project: 'OSTC/OHOS/manifest' - 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 # 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 # 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 # 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 # branch in the merge request instead of the explicit branch name in the
# manifest. # manifest.
- local: '/.ostc-ci/machines-and-flavours.yaml' - local: '/.oniro-ci/machines-and-flavours.yaml'
dco: dco:
extends: .dco extends: .dco
...@@ -57,7 +57,7 @@ aggregate-docs: ...@@ -57,7 +57,7 @@ aggregate-docs:
# incoming changes that match the repository holding this CI pipeline. # incoming changes that match the repository holding this CI pipeline.
.workspace: .workspace:
variables: 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 # Customize the .bitbake-workspace job to set the rules governing when a build
# is attempted to: modifications (changes) to the pipeline, meta-layers, # is attempted to: modifications (changes) to the pipeline, meta-layers,
......
.ostc-ci/machines-and-flavours.yaml → .oniro-ci/machines-and-flavours.yaml
+ 34
− 34
View file @ c0587d88
...@@ -14,9 +14,9 @@ linux-qemu-x86: ...@@ -14,9 +14,9 @@ linux-qemu-x86:
extends: .build-wic-image extends: .build-wic-image
variables: variables:
MACHINE: qemux86 MACHINE: qemux86
OHOS_BUILD_FLAVOUR: linux CI_ONIRO_BUILD_FLAVOUR: linux
OHOS_RECIPE_NAME: oniro-image-base-tests CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
# Set OHOS_BUILD_CACHE to "pub", overriding the value defined in the # Set CI_ONIRO_BUILD_CACHE to "pub", overriding the value defined in the
# .build job. This enables sharing of download and sstate-cache created # .build job. This enables sharing of download and sstate-cache created
# during this job. # during this job.
# #
...@@ -24,18 +24,18 @@ linux-qemu-x86: ...@@ -24,18 +24,18 @@ linux-qemu-x86:
# tainted build intermediate files, downloads or published artifacts. All # tainted build intermediate files, downloads or published artifacts. All
# the non-tainted builds help to populate a cache exposed at # the non-tainted builds help to populate a cache exposed at
# https://cache.ostc-eu.org/bitbake # https://cache.ostc-eu.org/bitbake
OHOS_BUILD_CACHE: "pub" CI_ONIRO_BUILD_CACHE: "pub"
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
linux-qemu-x86_64: linux-qemu-x86_64:
extends: .build-wic-image extends: .build-wic-image
variables: variables:
MACHINE: qemux86-64 MACHINE: qemux86-64
OHOS_BUILD_FLAVOUR: linux CI_ONIRO_BUILD_FLAVOUR: linux
OHOS_RECIPE_NAME: oniro-image-base-tests CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
# See the note on linux-qemu-x86. # See the note on linux-qemu-x86.
OHOS_BUILD_CACHE: "pub" CI_ONIRO_BUILD_CACHE: "pub"
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
linux-seco-intel-b68: linux-seco-intel-b68:
extends: .build-linux-matrix extends: .build-linux-matrix
...@@ -47,56 +47,56 @@ linux-seco-imx8mm-c61: ...@@ -47,56 +47,56 @@ linux-seco-imx8mm-c61:
variables: variables:
MACHINE: seco-imx8mm-c61 MACHINE: seco-imx8mm-c61
# This platform requires proprietary resources to boot. # This platform requires proprietary resources to boot.
# See build-generic.yaml for explanation of OHOS_BB_LOCAL_CONF_ variables. # See build-generic.yaml for explanation of CI_ONIRO_BB_LOCAL_CONF_ variables.
OHOS_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1 CI_ONIRO_BB_LOCAL_CONF_ACCEPT_FSL_EULA: 1
linux-stm32mp1-av96: linux-stm32mp1-av96:
extends: .build-recipe extends: .build-recipe
variables: variables:
OHOS_BUILD_FLAVOUR: linux CI_ONIRO_BUILD_FLAVOUR: linux
OHOS_RECIPE_NAME: oniro-image-base-tests CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
MACHINE: stm32mp1-av96 MACHINE: stm32mp1-av96
linux-raspberrypi4-64: linux-raspberrypi4-64:
extends: .build-wic-image extends: .build-wic-image
variables: variables:
MACHINE: raspberrypi4-64 MACHINE: raspberrypi4-64
OHOS_BUILD_FLAVOUR: linux CI_ONIRO_BUILD_FLAVOUR: linux
OHOS_RECIPE_NAME: oniro-image-base-tests CI_ONIRO_RECIPE_NAME: oniro-image-base-tests
zephyr-qemu-x86: zephyr-qemu-x86:
extends: .build-image extends: .build-image
variables: variables:
MACHINE: qemu-x86 MACHINE: qemu-x86
# See the note on linux-qemu-x86. # See the note on linux-qemu-x86.
OHOS_BUILD_CACHE: "pub" CI_ONIRO_BUILD_CACHE: "pub"
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
OHOS_RECIPE_NAME: zephyr-philosophers CI_ONIRO_RECIPE_NAME: zephyr-philosophers
OHOS_BUILD_FLAVOUR: zephyr CI_ONIRO_BUILD_FLAVOUR: zephyr
zephyr-qemu-cortex-m3: zephyr-qemu-cortex-m3:
extends: .build-image extends: .build-image
variables: variables:
MACHINE: qemu-cortex-m3 MACHINE: qemu-cortex-m3
# See the note on linux-qemu-x86. # See the note on linux-qemu-x86.
OHOS_BUILD_CACHE: "pub" CI_ONIRO_BUILD_CACHE: "pub"
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
OHOS_RECIPE_NAME: zephyr-philosophers CI_ONIRO_RECIPE_NAME: zephyr-philosophers
OHOS_BUILD_FLAVOUR: zephyr CI_ONIRO_BUILD_FLAVOUR: zephyr
zephyr-96b-nitrogen: zephyr-96b-nitrogen:
extends: .build-image extends: .build-image
variables: variables:
MACHINE: 96b-nitrogen MACHINE: 96b-nitrogen
OHOS_RECIPE_NAME: zephyr-philosophers CI_ONIRO_RECIPE_NAME: zephyr-philosophers
OHOS_BUILD_FLAVOUR: zephyr CI_ONIRO_BUILD_FLAVOUR: zephyr
zephyr-96b-nitrogen-tests: zephyr-96b-nitrogen-tests:
extends: .build-image extends: .build-image
variables: variables:
MACHINE: 96b-nitrogen MACHINE: 96b-nitrogen
OHOS_RECIPE_NAME: zephyr-kernel-test-all CI_ONIRO_RECIPE_NAME: zephyr-kernel-test-all
OHOS_BUILD_FLAVOUR: zephyr CI_ONIRO_BUILD_FLAVOUR: zephyr
zephyr-96b-avenger: zephyr-96b-avenger:
extends: .build-zephyr extends: .build-zephyr
...@@ -120,28 +120,28 @@ freertos-armv5: ...@@ -120,28 +120,28 @@ freertos-armv5:
variables: variables:
MACHINE: qemuarmv5 MACHINE: qemuarmv5
# See the note on linux-qemu-x86. # See the note on linux-qemu-x86.
OHOS_BUILD_CACHE: "pub" CI_ONIRO_BUILD_CACHE: "pub"
OHOS_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1 CI_ONIRO_BB_LOCAL_CONF_BB_GENERATE_MIRROR_TARBALLS: 1
blueprint-smartpanel-zephyr: blueprint-smartpanel-zephyr:
extends: .build-zephyr extends: .build-zephyr
variables: variables:
MACHINE: 96b-nitrogen MACHINE: 96b-nitrogen
DISTRO: oniro-zephyr-blueprint-dashboard 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: blueprint-smartpanel-linux:
extends: .build-linux extends: .build-linux
tags: [large-disk, bitbake-friendly, heavy, $OHOS_RUNNER_TAG] tags: [large-disk, bitbake-friendly, heavy, $CI_ONIRO_RUNNER_TAG]
variables: variables:
MACHINE: stm32mp1-av96 MACHINE: stm32mp1-av96
DISTRO: oniro-linux-blueprint-dashboard DISTRO: oniro-linux-blueprint-dashboard
OHOS_BITBAKE_TARGETS: "blueprint-dashboard-gateway-image" CI_ONIRO_BITBAKE_TARGETS: "blueprint-dashboard-gateway-image"
blueprint-gateway-linux: blueprint-gateway-linux:
extends: .build-linux extends: .build-linux
tags: [large-disk, bitbake-friendly, heavy, $OHOS_RUNNER_TAG] tags: [large-disk, bitbake-friendly, heavy, $CI_ONIRO_RUNNER_TAG]
variables: variables:
MACHINE: raspberrypi4-64 MACHINE: raspberrypi4-64
DISTRO: oniro-linux-blueprint-gateway DISTRO: oniro-linux-blueprint-gateway
OHOS_BITBAKE_TARGETS: "blueprint-gateway-image" CI_ONIRO_BITBAKE_TARGETS: "blueprint-gateway-image"
docs/ci/machines-and-flavours.rst
+ 22
− 20
View file @ c0587d88
...@@ -21,9 +21,10 @@ linux-qemu-x86 ...@@ -21,9 +21,10 @@ linux-qemu-x86
.............. ..............
This job extends `.build-linux` job from the manifest repository and builds This job extends `.build-linux` job from the manifest repository and builds
``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using ``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
the Linux flavour of |main_project_name| and ``MACHINE=qemux86``. This job checks that 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. |main_project_name| software can be built for a basic 32bit x86 virtual
machine.
The cache for this job is publicly available. The cache for this job is publicly available.
...@@ -31,9 +32,10 @@ linux-qemu-x86_64 ...@@ -31,9 +32,10 @@ linux-qemu-x86_64
................. .................
This job extends `.build-linux` job from the manifest repository and builds This job extends `.build-linux` job from the manifest repository and builds
``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using ``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
the Linux flavour of |main_project_name| and ``MACHINE=qemux86-64``. This job checks that 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. |main_project_name| software can be built for a basic 64bit x86 virtual
machine.
The cache for this job is publicly available. The cache for this job is publicly available.
...@@ -41,9 +43,9 @@ linux-seco-intel-b68 ...@@ -41,9 +43,9 @@ linux-seco-intel-b68
.................... ....................
This job extends `.build-linux` job from the manifest repository and builds This job extends `.build-linux` job from the manifest repository and builds
``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using ``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
the Linux flavour of |main_project_name| and ``MACHINE=seco-intel-b68``. This job flavour of |main_project_name| and ``MACHINE=seco-intel-b68``. This job checks
checks that |main_project_name| software can be built for the SECO B68 development that |main_project_name| software can be built for the SECO B68 development
board, which contains an Intel x86_64 SoC. board, which contains an Intel x86_64 SoC.
.. note:: .. note::
...@@ -54,9 +56,9 @@ linux-seco-imx8mm-c61 ...@@ -54,9 +56,9 @@ linux-seco-imx8mm-c61
..................... .....................
This job extends `.build-linux` job from the manifest repository and builds This job extends `.build-linux` job from the manifest repository and builds
``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using ``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
the Linux flavour of |main_project_name| and ``MACHINE=seco-imx8mm-c61``. This job flavour of |main_project_name| and ``MACHINE=seco-imx8mm-c61``. This job checks
checks that |main_project_name| software can be built for the SECO C61 development 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 board, which contains the NXP i.MX 8M Mini SoC, which implements 64bit ARMv8
architecture. architecture.
...@@ -68,11 +70,11 @@ linux-stm32mp1-av96 ...@@ -68,11 +70,11 @@ linux-stm32mp1-av96
................... ...................
This job extends `.build-linux` job from the manifest repository and builds This job extends `.build-linux` job from the manifest repository and builds
``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using ``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
the Linux flavour of |main_project_name| and ``MACHINE=stm32mp1-av96``. This job checks 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 that |main_project_name| software can be built for the 96Boards Avenger
board, which contains the STM32MP157 SoC, which implements 32bit ARMv7 development board, which contains the STM32MP157 SoC, which implements 32bit
architecture. ARMv7 architecture.
.. note:: .. note::
The cache for this job is not public, pending legal review of any firmware The cache for this job is not public, pending legal review of any firmware
...@@ -82,9 +84,9 @@ linux-raspberrypi4-64 ...@@ -82,9 +84,9 @@ linux-raspberrypi4-64
..................... .....................
This job extends `.build-linux` job from the manifest repository and builds This job extends `.build-linux` job from the manifest repository and builds
``allscenarios-image-base-tests`` and ``allscenarios-image-extra-tests`` using ``oniro-image-base-tests`` and ``oniro-image-extra-tests`` using the Linux
the Linux flavour of |main_project_name| and ``MACHINE=raspberrypi4-64``. This job flavour of |main_project_name| and ``MACHINE=raspberrypi4-64``. This job checks
checks that |main_project_name| software can be built for the Raspberry Pi 4B that |main_project_name| software can be built for the Raspberry Pi 4B
development board, which contains the BCM2711 SoC, which implements 64bit ARMv8 development board, which contains the BCM2711 SoC, which implements 64bit ARMv8
architecture. architecture.
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Copyright © Eclipse Foundation, Inc. All Rights Reserved.     Privacy Policy | Terms of Use | Copyright Agent