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

Split off .stage from check-layer job


The .stage job can be shared between layer-check and the upcoming
bitbake parse job.

Signed-off-by: default avatarZygmunt Krynicki <zygmunt.krynicki@huawei.com>
parent 300988ad
No related branches found
No related tags found
No related merge requests found
...@@ -14,7 +14,7 @@ ...@@ -14,7 +14,7 @@
# See the License for the specific language governing permissions and # See the License for the specific language governing permissions and
# limitations under the License. # limitations under the License.
check-layer: .stage:
stage: test stage: test
image: image:
name: registry.ostc-eu.org/ostc/containers/ostc-builder:latest name: registry.ostc-eu.org/ostc/containers/ostc-builder:latest
...@@ -40,7 +40,7 @@ check-layer: ...@@ -40,7 +40,7 @@ check-layer:
# https://git.ostc-eu.org/OSTC/infrastructure/ostc-manifest-mirror/-/issues/2 # https://git.ostc-eu.org/OSTC/infrastructure/ostc-manifest-mirror/-/issues/2
- git clone --depth 1 --branch dunfell git://git.openembedded.org/meta-openembedded.git - git clone --depth 1 --branch dunfell git://git.openembedded.org/meta-openembedded.git
script: script: &stage-do
# Reload the value of SCRATCH_DIR set in the before_script phase. Those run # Reload the value of SCRATCH_DIR set in the before_script phase. Those run
# in separate shell processes and do not share environment variables. # in separate shell processes and do not share environment variables.
- SCRATCH_DIR="$(cat "$CI_PROJECT_DIR"/.scratch-dir-name)" - SCRATCH_DIR="$(cat "$CI_PROJECT_DIR"/.scratch-dir-name)"
...@@ -51,8 +51,6 @@ check-layer: ...@@ -51,8 +51,6 @@ check-layer:
# devtool and other related tools. # devtool and other related tools.
# xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx # xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
# Run yocto-layer-check with the meta-python and meta-oe layers as dependencies.
- yocto-check-layer --dependency "$SCRATCH_DIR"/meta-openembedded/meta-python/ "$SCRATCH_DIR"/meta-openembedded/meta-oe/ --with-software-layer-signature-check --debug "$CI_PROJECT_DIR"
after_script: after_script:
# Reload the value of SCRATCH_DIR set in the before_script phase. # Reload the value of SCRATCH_DIR set in the before_script phase.
...@@ -60,3 +58,10 @@ check-layer: ...@@ -60,3 +58,10 @@ check-layer:
# Clean up after ourselves. # Clean up after ourselves.
- rm -f "$CI_PROJECT_DIR"/.scratch-dir-name - rm -f "$CI_PROJECT_DIR"/.scratch-dir-name
- rm -rf "$SCRATCH_DIR" - rm -rf "$SCRATCH_DIR"
check-layer:
extends: .stage
script:
- *stage-do
# Run yocto-layer-check with the meta-python and meta-oe layers as dependencies.
- yocto-check-layer --dependency "$SCRATCH_DIR"/meta-openembedded/meta-python/ "$SCRATCH_DIR"/meta-openembedded/meta-oe/ --with-software-layer-signature-check --debug "$CI_PROJECT_DIR"
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment