Skip to content
Snippets Groups Projects
Commit 4b57461a authored by Lorenzo Pagliai's avatar Lorenzo Pagliai
Browse files

Add MANIFEST_GROUP variable

* The variable is necessary when the GitBot will be given access to
sveral groups to restrict the search for the manifest repository
* Add --verbose option and other debug stuff in merge job
parent 21a1fc47
No related branches found
No related tags found
No related merge requests found
...@@ -24,6 +24,7 @@ variables: ...@@ -24,6 +24,7 @@ variables:
# https://gitlab.com/gitlab-org/gitlab/-/issues/209904 # https://gitlab.com/gitlab-org/gitlab/-/issues/209904
# As soon as this gets fixed upstream, the hard-coded branch name should be removed. # As soon as this gets fixed upstream, the hard-coded branch name should be removed.
MANIFEST_PROJECT: seco-manifest MANIFEST_PROJECT: seco-manifest
MANIFEST_GROUP: yocto_ng
MASTER_BRANCH_MANIFEST: kirkstone/develop MASTER_BRANCH_MANIFEST: kirkstone/develop
BB_RECIPE_NAME: none BB_RECIPE_NAME: none
...@@ -61,7 +62,7 @@ integrate: ...@@ -61,7 +62,7 @@ integrate:
- .gitlab-ci/scripts/integrate_into_manifest.py - .gitlab-ci/scripts/integrate_into_manifest.py
--gitlab-url=${CI_SERVER_URL} --gitlab-url=${CI_SERVER_URL}
--token=${GITBOT_TOKEN} --token=${GITBOT_TOKEN}
--manifest-project=${MANIFEST_PROJECT} --manifest-project=${MANIFEST_GROUP}/${MANIFEST_PROJECT}
--manifest-file=${MANIFEST_FILE} --manifest-file=${MANIFEST_FILE}
--manifest-branch=${MASTER_BRANCH_MANIFEST} --manifest-branch=${MASTER_BRANCH_MANIFEST}
--project=${CI_PROJECT_PATH} --project=${CI_PROJECT_PATH}
...@@ -73,7 +74,6 @@ integrate: ...@@ -73,7 +74,6 @@ integrate:
paths: paths:
- manifest_revision - manifest_revision
#yamllint: #yamllint:
# extends: .yamllint # extends: .yamllint
...@@ -92,16 +92,25 @@ merge: ...@@ -92,16 +92,25 @@ merge:
when: always when: always
script: script:
- cd ${CI_PROJECT_DIR} - cd ${CI_PROJECT_DIR}
- echo ${CI_SERVER_URL}
- echo ${GITBOT_TOKEN}
- echo ${MANIFEST_PROJECT}
- echo ${MASTER_BRANCH_MANIFEST}
- echo ${CI_PROJECT_PATH}
- echo ${MASTER_BRANCH}
- echo ${CI_COMMIT_SOURCE}
- echo ${BB_RECIPE_NAME}
- .gitlab-ci/scripts/merge_into_manifest.py - .gitlab-ci/scripts/merge_into_manifest.py
--gitlab-url=${CI_SERVER_URL} --gitlab-url=${CI_SERVER_URL}
--token=${GITBOT_TOKEN} --token=${GITBOT_TOKEN}
--manifest-project=${MANIFEST_PROJECT} --manifest-project=${MANIFEST_GROUP}/${MANIFEST_PROJECT}
--manifest-branch=${MASTER_BRANCH_MANIFEST} --manifest-branch=${MASTER_BRANCH_MANIFEST}
--project=${CI_PROJECT_PATH} --project=${CI_PROJECT_PATH}
--project-branch=${MASTER_BRANCH} --project-branch=${MASTER_BRANCH}
--commit=${CI_COMMIT_SOURCE} --commit=${CI_COMMIT_SOURCE}
--save-revision-to=manifest_revision --save-revision-to=manifest_revision
--recipe-name=${BB_RECIPE_NAME} --recipe-name=${BB_RECIPE_NAME}
--verbose
artifacts: artifacts:
paths: paths:
- manifest_revision - manifest_revision
......
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