From c1ebf70c13ce48b45c2674ba2f7b255dcc6a3ed7 Mon Sep 17 00:00:00 2001 From: Tobias Poganiuch <tobias.poganiuch@garz-fricke.com> Date: Tue, 26 Apr 2022 15:51:39 +0200 Subject: [PATCH] manifest: Added manifest file selection to ci-test --- ci-test-manifest-integration.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ci-test-manifest-integration.yml b/ci-test-manifest-integration.yml index 9940da3c..baf283d4 100644 --- a/ci-test-manifest-integration.yml +++ b/ci-test-manifest-integration.yml @@ -21,6 +21,7 @@ variables: # (https://gitlab.com/gitlab-org/gitlab/-/issues/249583) MANIFEST_PROJECT: "${CI_PROJECT_ROOT_NAMESPACE}/yocto/infrastructure/\ ci-test/minimal-manifest" + MANIFEST_FILE: "default.xml" # The master branch is hardcoded here, because it cannot be determined automatically. # Has to be modified for new branches, e.g. new Yocto versions or fix releases. MASTER_BRANCH_MANIFEST: master @@ -82,6 +83,7 @@ integrate: --gitlab-url=${CI_SERVER_URL} --token=${GITBOT_TOKEN} --manifest-project=${MANIFEST_PROJECT} + --manifest-file=${MANIFEST_FILE} --integration-base=${MASTER_BRANCH_MANIFEST} --project=${CI_PROJECT_PATH} --merge-request=${MERGE_REQUEST} -- GitLab