diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 9a4503b9a97cac430cab9d2b052a92a5f70f6191..1f86c6c0ce1995871a899800e61a61141a1e3ab4 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -18,8 +18,8 @@ default: stages: - analyze - - deploy-test - deploy + - integrate workflow: rules: @@ -58,9 +58,7 @@ yamllint: # Stage: deploy-test # --------------------------------------------------------------------------------------- deploy-foobar-manifest: - stage: deploy-test - # when: manual - allow_failure: true + stage: deploy script: - cd ${CI_PROJECT_DIR} - if [[ "$CI_COMMIT_BRANCH" == "master" ]]; then MERGE="--merge"; else MERGE=""; fi @@ -75,41 +73,55 @@ deploy-foobar-manifest: ${PROJECT_ROOT}/minimal-foo ${PROJECT_ROOT}/minimal-bar +.integrate: &integrate + stage: integrate + needs: ["deploy-foobar-manifest"] + trigger: + project: ${CI_PROJECT_ROOT_NAMESPACE}/${CI_JOB_NAME} + branch: "integrate/${CI_PROJECT_NAME}/${CI_COMMIT_REF_NAME}" + strategy: depend + +yocto/infrastructure/ci-test/minimal-bar: *integrate +yocto/infrastructure/ci-test/minimal-foo: *integrate + + # --------------------------------------------------------------------------------------- # Stage: deploy # --------------------------------------------------------------------------------------- -.deploy: &deploy - stage: deploy - when: manual - allow_failure: true - script: - - cd ${CI_PROJECT_DIR} - - if [[ "$CI_COMMIT_BRANCH" == "master" ]]; then MERGE="--merge"; else MERGE=""; fi - - ./deploy_gitlab_ci.py - --gitlab-url=${CI_SERVER_URL} - --token=${GITBOT_TOKEN} - --project=${CI_PROJECT_ROOT_NAMESPACE}/${CI_JOB_NAME} - --submodule=.gitlab-ci - --revision=${CI_COMMIT_SHA} - ${MERGE} +# .deploy: &deploy +# stage: deploy +# when: manual +# allow_failure: true +# script: +# - cd ${CI_PROJECT_DIR} +# - if [[ "$CI_COMMIT_BRANCH" == "master" ]]; then MERGE="--merge"; +# else MERGE=""; fi +# - ./deploy_gitlab_ci.py +# --gitlab-url=${CI_SERVER_URL} +# --token=${GITBOT_TOKEN} +# --project=${CI_PROJECT_ROOT_NAMESPACE}/${CI_JOB_NAME} +# --submodule=.gitlab-ci +# --revision=${CI_COMMIT_SHA} +# ${MERGE} +# -3rd-party/kuk/uboot-imx-kuk: *deploy -kernel/linux-guf: *deploy -kernel/linux-imx-kuk: *deploy -kernel/modules/egalaxi2c: *deploy -kernel/modules/gfplatdetect: *deploy -tools/gf-emc-test-suite: *deploy -tools/gf-productiontests: *deploy -tools/gfeeprom: *deploy -tools/gfxml2dto: *deploy -tools/guf-show-demo: *deploy -tools/libmdb: *deploy -tools/touchcal-conv: *deploy -tools/xconfig: *deploy -yocto/config: *deploy -yocto/infrastructure/ci-test/minimal-bar: *deploy -yocto/infrastructure/ci-test/minimal-foo: *deploy -yocto/infrastructure/ci-test/minimal-manifest: *deploy -yocto/layers/meta-guf-distro: *deploy -yocto/layers/meta-guf-machine: *deploy -yocto/manifest: *deploy +# 3rd-party/kuk/uboot-imx-kuk: *deploy +# kernel/linux-guf: *deploy +# kernel/linux-imx-kuk: *deploy +# kernel/modules/egalaxi2c: *deploy +# kernel/modules/gfplatdetect: *deploy +# tools/gf-emc-test-suite: *deploy +# tools/gf-productiontests: *deploy +# tools/gfeeprom: *deploy +# tools/gfxml2dto: *deploy +# tools/guf-show-demo: *deploy +# tools/libmdb: *deploy +# tools/touchcal-conv: *deploy +# tools/xconfig: *deploy +# yocto/config: *deploy +# yocto/infrastructure/ci-test/minimal-bar: *deploy +# yocto/infrastructure/ci-test/minimal-foo: *deploy +# yocto/infrastructure/ci-test/minimal-manifest: *deploy +# yocto/layers/meta-guf-distro: *deploy +# yocto/layers/meta-guf-machine: *deploy +# yocto/manifest: *deploy