diff --git a/manifest-integration.yml b/manifest-integration.yml index 605a2c3a7df82ac28ad95e1c873d91fc13ab27fa..70f3c463d0a1095176511c076b023acc09dd059b 100644 --- a/manifest-integration.yml +++ b/manifest-integration.yml @@ -24,6 +24,7 @@ variables: # https://gitlab.com/gitlab-org/gitlab/-/issues/209904 # As soon as this gets fixed upstream, the hard-coded branch name should be removed. MANIFEST_PROJECT: seco-manifest + MANIFEST_GROUP: yocto_ng MASTER_BRANCH_MANIFEST: kirkstone/develop BB_RECIPE_NAME: none @@ -61,7 +62,7 @@ integrate: - .gitlab-ci/scripts/integrate_into_manifest.py --gitlab-url=${CI_SERVER_URL} --token=${GITBOT_TOKEN} - --manifest-project=${MANIFEST_PROJECT} + --manifest-project=${MANIFEST_GROUP}/${MANIFEST_PROJECT} --manifest-file=${MANIFEST_FILE} --manifest-branch=${MASTER_BRANCH_MANIFEST} --project=${CI_PROJECT_PATH} @@ -73,7 +74,6 @@ integrate: paths: - manifest_revision - #yamllint: # extends: .yamllint @@ -92,16 +92,25 @@ merge: when: always script: - 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-url=${CI_SERVER_URL} --token=${GITBOT_TOKEN} - --manifest-project=${MANIFEST_PROJECT} + --manifest-project=${MANIFEST_GROUP}/${MANIFEST_PROJECT} --manifest-branch=${MASTER_BRANCH_MANIFEST} --project=${CI_PROJECT_PATH} --project-branch=${MASTER_BRANCH} --commit=${CI_COMMIT_SOURCE} --save-revision-to=manifest_revision --recipe-name=${BB_RECIPE_NAME} + --verbose artifacts: paths: - manifest_revision