diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5022ee4379a61f73b87d91227af9993237249e06..bb712d74777147d0a0d968b9b641ea6d59bf4e9b 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -109,7 +109,6 @@ yamllint: --manifest-project=${MANIFEST_PROJECT} --submodule=.gitlab-ci --revision=${CI_COMMIT_SHA} - --verbose ${DEPLOY_TO} - ./generate_job_from_template.py @@ -118,7 +117,6 @@ yamllint: --branch="integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}" --manifest-project=${MANIFEST_PROJECT} --parent_merge_request="${CI_MERGE_REQUEST_PROJECT_URL}/-/merge_requests/${CI_MERGE_REQUEST_IID}" - --verbose ${DEPLOY_TO} > integration.yml - cat integration.yml @@ -130,10 +128,6 @@ deploy: extends: - .deploy - .manifest-projects - rules: - # For now to test the merge step - - when: manual - allow_failure: true deploy-foobar: extends: @@ -176,7 +170,6 @@ trigger-foobar: --manifest-project=${MANIFEST_PROJECT} --submodule=.gitlab-ci --revision=${CI_COMMIT_SHA} - --verbose ${DEPLOY_TO} merge-foobar: @@ -184,6 +177,11 @@ merge-foobar: - .merge - .foobar-manifest-projects +merge: + extends: + - .merge + - .manifest-projects + # -------------------------------------------------------------------------------------- # Stage: check # -------------------------------------------------------------------------------------- @@ -206,7 +204,6 @@ check: --integration-base=${MASTER_BRANCH} --project=${CI_PROJECT_PATH} --merge-request=${CI_MERGE_REQUEST_IID} - --verbose # The check is done for both manifests in one job as the retrigger # looks for jobs named check, though there can only be one @@ -218,4 +215,3 @@ check: --integration-base=master --project=${CI_PROJECT_PATH} --merge-request=${CI_MERGE_REQUEST_IID} - --verbose diff --git a/README.md b/README.md index 0ae045bb77877e6df22d2f6ffe9a35d35847b9a1..76b9901dab8eb7664531a184090dba13513e70f3 100644 --- a/README.md +++ b/README.md @@ -36,6 +36,8 @@ version in the SRCREV.conf file. * BB\_RECIPE\_NAME: Set the name of the bitbake recipe 1. Create a corresponding entry in the SRCREV.conf file of the manifest repo\ `SRCREV_pn-<bitbake-recipe> = "<current-commit-hash>"` +1. Add the project into the gitlab-ci project's .gitlab-ci.yml, so changes to the +CI are deployed into the new project. **Repository settings** 1. Verify that the merge strategy is set to *Fast-forward merge* diff --git a/merge_gitlab_ci.py b/merge_gitlab_ci.py index bd380b7d6aea8dacefbe43955d6f89cee14a08b2..35963bbbe0928f8fea643d838bcdb413456f33e9 100755 --- a/merge_gitlab_ci.py +++ b/merge_gitlab_ci.py @@ -143,7 +143,7 @@ def main(): project, args.submodule, args.revision, branch ) - logging.debug("Merge %s!%d: %s", project.name, mr.iid, mr.title) + print("Merge {}!{}: {}".format(project.name, mr.iid, mr.title)) # Wait until GitLab has checked merge status common.wait_until_merge_status_is_set(project, mr)