Skip to content
Snippets Groups Projects
Commit c7f8bf0d authored by Jonas Höppner's avatar Jonas Höppner
Browse files

CI: Integration job is now optional, remove check job

parent 55e34b98
No related branches found
No related tags found
1 merge request!115CI: Rename gitlab-ci jobs
......@@ -101,6 +101,8 @@ yamllint:
stage: integrate
rules:
- if: $CI_MERGE_REQUEST_IID
when: manual
allow_failure: true
script:
- cd ${CI_PROJECT_DIR}
- ./deploy_gitlab_ci.py
......@@ -138,6 +140,7 @@ trigger-yocto:
stage: integrate
rules:
- if: $CI_MERGE_REQUEST_IID
allow_failure: true
needs: [integrate-yocto]
trigger:
include:
......@@ -163,6 +166,8 @@ trigger-ci-test:
stage: merge
rules:
- if: $CI_COMMIT_BRANCH == "master"
when: manual
allow_failure: true
script:
- cd ${CI_PROJECT_DIR}
- ./merge_gitlab_ci.py
......@@ -188,7 +193,10 @@ merge-yocto:
# --------------------------------------------------------------------------------------
check:
stage: check
needs: [integrate-yocto, integrate-ci-test]
rules:
# Probably this job gets removed
- when: never
- if: $CI_MERGE_REQUEST_IID
tags:
- infrastructure
......
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