diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5a13d3fc8fc293827227714815a35a035f4ff27f..c81a929d0814a95bab393233060ca05d5aad7b2a 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -125,6 +125,8 @@ deploy: extends: - .deploy - .manifest-projects + rules: + - when: never deploy-foobar: extends: @@ -134,6 +136,7 @@ deploy-foobar: trigger: stage: deploy rules: + - when: never - if: $CI_MERGE_REQUEST_IID needs: [deploy] trigger: @@ -194,13 +197,13 @@ check: - MERGE_REQUEST="${CI_MERGE_REQUEST_IID}"; - MASTER_BRANCH=dunfell - - ./check_if_integration_branch_is_up_to_date.py - --gitlab-url=${CI_SERVER_URL} - --token=${GITBOT_TOKEN} - --manifest-project=${CI_PROJECT_ROOT_NAMESPACE}/yocto/manifest - --integration-base=${MASTER_BRANCH} - --project=${CI_PROJECT_PATH} - --merge-request=${CI_MERGE_REQUEST_IID} + # - ./check_if_integration_branch_is_up_to_date.py + # --gitlab-url=${CI_SERVER_URL} + # --token=${GITBOT_TOKEN} + # --manifest-project=${CI_PROJECT_ROOT_NAMESPACE}/yocto/manifest + # --integration-base=${MASTER_BRANCH} + # --project=${CI_PROJECT_PATH} + # --merge-request=${CI_MERGE_REQUEST_IID} # The check is done for both manifests in one job as the retrigger # looks for jobs named check, though there can only be one @@ -212,3 +215,4 @@ check: --integration-base=master --project=${CI_PROJECT_PATH} --merge-request=${CI_MERGE_REQUEST_IID} + --verbose diff --git a/common.yml b/common.yml index 6bf9db6c141578c94b7f81544b31b750c3beb10f..f576e657d2b677d4f9297fbef720980e937dfa4a 100644 --- a/common.yml +++ b/common.yml @@ -79,4 +79,5 @@ yamllint: --integration-base=${MASTER_BRANCH_MANIFEST} --project=${CI_PROJECT_PATH} --merge-request=${MERGE_REQUEST} + --verbose ${PARENT_MR} diff --git a/foobar-manifest-integration.yml b/foobar-manifest-integration.yml index 956cccc98b52cdf17628df386ce89d6c91d65a38..3fee8622926f87f59deaaa80fa0feda1afbad6c6 100644 --- a/foobar-manifest-integration.yml +++ b/foobar-manifest-integration.yml @@ -111,6 +111,7 @@ merge: --commit=${CI_COMMIT_SHA} --save-revision-to=manifest_revision --recipe-name=${BB_RECIPE_NAME} + --verbose artifacts: paths: - manifest_revision diff --git a/merge_into_manifest.py b/merge_into_manifest.py index 2ba9eb3cd5c9903d29e039e52cf8aeee9902ef8f..a55e4eb6a877c20166cd177f96775342d6d30f89 100755 --- a/merge_into_manifest.py +++ b/merge_into_manifest.py @@ -2,6 +2,7 @@ import common import argparse +import logging import sys import time from gitlab import Gitlab @@ -37,9 +38,10 @@ def merge_into_manifest( recipe_name=recipe_name, srcrev_file=srcrev_file, ) + logging.debug(current_revisions) # This commit is contained there if current_revisions contains # it directly or any parrent of current_revisions is commit - for rev in current_revisions: + for rev in current_revisions.values(): if common.is_commit_parent_of_project_commit(project, rev, commit): print( "Commit {} is already merged into {}".format( @@ -191,8 +193,16 @@ def main(): dest="revision_file", required=False, ) + parser.add_argument( + "-v", + "--verbose", + action="store_true", + help="""Increase verbosity.""", + ) args, _ = parser.parse_known_args() + if args.verbose: + logging.basicConfig(level=logging.DEBUG) gitlab = Gitlab(args.gitlab_url, private_token=args.token) project = common.get_project(gitlab, args.project)