diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 328d426958059100c2630ff89d6a750da4c9a19d..0fcdf03e67f2ce0e23404d1d8347331e1d1eb181 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -108,19 +108,19 @@ executable: resource_group: integrate-yocto variables: PROJECT_GROUP: ${CI_PROJECT_ROOT_NAMESPACE} - MANIFEST_PROJECT: ${PROJECT_GROUP}/yocto_ng/seco-manifest + MANIFEST_PROJECT: ${PROJECT_GROUP}/seco-manifest # Jobs -integrate-ci-test:primary: - extends: .integrate-ci-test - variables: - MANIFEST_BRANCH: primary - -integrate-ci-test:secondary: - extends: .integrate-ci-test - variables: - MANIFEST_BRANCH: secondary +#integrate-ci-test:primary: +# extends: .integrate-ci-test +# variables: +# MANIFEST_BRANCH: primary +# +#integrate-ci-test:secondary: +# extends: .integrate-ci-test +# variables: +# MANIFEST_BRANCH: secondary #integrate-yocto:dunfell: # extends: .integrate-yocto @@ -161,17 +161,17 @@ integrate-yocto:kirkstone: # Jobs -build-ci-test:primary: - extends: .build-ci-test - needs: ["integrate-ci-test:primary"] - variables: - MANIFEST_BRANCH: primary - -build-ci-test:secondary: - extends: .build-ci-test - needs: ["integrate-ci-test:secondary"] - variables: - MANIFEST_BRANCH: secondary +#build-ci-test:primary: +# extends: .build-ci-test +# needs: ["integrate-ci-test:primary"] +# variables: +# MANIFEST_BRANCH: primary +# +#build-ci-test:secondary: +# extends: .build-ci-test +# needs: ["integrate-ci-test:secondary"] +# variables: +# MANIFEST_BRANCH: secondary #build-yocto:dunfell: # extends: .build-yocto @@ -198,12 +198,12 @@ build-yocto:kirkstone: variables: MERGE: --merge --project=${CI_PROJECT_PATH} --branch=${CI_COMMIT_REF_NAME} -merge-ci-test: - extends: - - .integrate-ci-test - - .merge - variables: - MANIFEST_BRANCH: primary,secondary +#merge-ci-test: +# extends: +# - .integrate-ci-test +# - .merge +# variables: +# MANIFEST_BRANCH: primary,secondary merge-yocto: extends: