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

[CUSTOM] Add management of custom project CI/CD integration

* Modify common.py script to hide integration comments on custom
projects
parent a216d5b4
No related branches found
No related tags found
No related merge requests found
...@@ -108,6 +108,14 @@ executable: ...@@ -108,6 +108,14 @@ executable:
PROJECT_GROUP: ${CI_PROJECT_ROOT_NAMESPACE} PROJECT_GROUP: ${CI_PROJECT_ROOT_NAMESPACE}
MANIFEST_PROJECT: ${PROJECT_GROUP}/seco-manifest MANIFEST_PROJECT: ${PROJECT_GROUP}/seco-manifest
.integrate-custom-1:
extends: .integrate
resource_group: integrate-custom-1
variables:
PROJECT_GROUP: ${CUSTOM_1_GROUP}
MANIFEST_PROJECT: ${PROJECT_GROUP}/manifest
MANIFEST_BRANCH: ${CUSTOM_1_BRANCH}
# Jobs # Jobs
#integrate-ci-test:primary: #integrate-ci-test:primary:
...@@ -130,6 +138,10 @@ integrate-yocto:kirkstone: ...@@ -130,6 +138,10 @@ integrate-yocto:kirkstone:
variables: variables:
MANIFEST_BRANCH: kirkstone MANIFEST_BRANCH: kirkstone
integrate-yocto:custom-1:
extends: .integrate-yocto
variables:
MANIFEST_BRANCH: ${CUSTOM_1_BRANCH}
# -------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------
# Stage: build # Stage: build
...@@ -157,6 +169,12 @@ integrate-yocto:kirkstone: ...@@ -157,6 +169,12 @@ integrate-yocto:kirkstone:
branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${MANIFEST_BRANCH}" branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${MANIFEST_BRANCH}"
strategy: depend strategy: depend
.build-custom-1:
extends: .build
trigger:
project: ${CUSTOM_1_GROUP}/manifest
branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}/into/${CUSTOM_1_BRANCH}"
strategy: depend
# Jobs # Jobs
#build-ci-test:primary: #build-ci-test:primary:
...@@ -183,6 +201,11 @@ build-yocto:kirkstone: ...@@ -183,6 +201,11 @@ build-yocto:kirkstone:
variables: variables:
MANIFEST_BRANCH: kirkstone MANIFEST_BRANCH: kirkstone
build-yocto:custom-1:
extends: .build-custom-1
needs: ["integrate-yocto:custom-1"]
variables:
MANIFEST_BRANCH: ${CUSTOM_1_BRANCH}
# -------------------------------------------------------------------------------------- # --------------------------------------------------------------------------------------
# Stage: merge # Stage: merge
...@@ -209,3 +232,10 @@ merge-yocto: ...@@ -209,3 +232,10 @@ merge-yocto:
- .merge - .merge
variables: variables:
MANIFEST_BRANCH: kirkstone MANIFEST_BRANCH: kirkstone
merge-custom-1:
extends:
- .integrate-custom-1
- .merge
variables:
MANIFEST_BRANCH: ${CUSTOM_1_BRANCH}
\ No newline at end of file
...@@ -130,13 +130,14 @@ def rebase_merge_request(project, merge_request): ...@@ -130,13 +130,14 @@ def rebase_merge_request(project, merge_request):
def crosslink_merge_requests(source_mr: MergeRequest, integration_mr: MergeRequest): def crosslink_merge_requests(source_mr: MergeRequest, integration_mr: MergeRequest):
"""Insert cross-links in merge requests""" """Insert cross-links in merge requests"""
integration_mr.notes.create( if "custom" not in source_mr.web_url:
{"body": "Source merge request: %s" % source_mr.web_url} integration_mr.notes.create(
) {"body": "Source merge request: %s" % source_mr.web_url}
source_mr.notes.create( )
{"body": "Integration merge request: %s" % integration_mr.web_url} if "custom" not in integration_mr.web_url:
) source_mr.notes.create(
{"body": "Integration merge request: %s" % integration_mr.web_url}
)
def wait_until_merge_status_is_set(project: Project, mr: MergeRequest): def wait_until_merge_status_is_set(project: Project, mr: MergeRequest):
"""Periodically query MR until GitLab has checked its merge status""" """Periodically query MR until GitLab has checked its merge status"""
......
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