From c1d119237dac63df6e9003c6d1082ccbe4a6cedb Mon Sep 17 00:00:00 2001 From: "sebastien.heurtematte" <sebastien.heurtematte@eclipse-foundation.org> Date: Tue, 8 Nov 2022 10:20:37 +0100 Subject: [PATCH] feat: test deploy stage Signed-off-by: sebastien.heurtematte <sebastien.heurtematte@eclipse-foundation.org> --- .gitlab-ci.yml | 48 ++++++++++++++++++++++++------------------------ 1 file changed, 24 insertions(+), 24 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 5885594..1515f89 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -217,28 +217,28 @@ build-docs: <!-- add docs at the exact version are testing --> <project name="${CI_PROJECT_NAME}" path="docs" remote="oniro-override" revision="${CI_COMMIT_SHA}" /> </manifest> - rules: - # During the merge request, substitute the "docs" repository that is - # described by the manifest with the project that is the source of the - # merge request. This does not test the merged result but is the next best - # thing we can do right now. - - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' - variables: - CI_ONIRO_REPO_WORKSPACE_LOCAL_MANIFEST_INTERPRETER: eval - CI_ONIRO_REPO_WORKSPACE_LOCAL_MANIFEST: | - cat <<__EOM__ - <?xml version="1.0" encoding="UTF-8"?> - <manifest> - <!-- remove original docs project entry --> - <remove-project name="oniro-core/docs.git" /> - <!-- add remote representing the project --> - <remote name="oniro-override" fetch="${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}/../" /> - <!-- add docs at the exact version are testing --> - <project name="$(basename "$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH")" path="docs" remote="oniro-override" revision="${CI_COMMIT_SHA}" /> - </manifest> - __EOM__ - # Or when things land. - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + # rules: + # # During the merge request, substitute the "docs" repository that is + # # described by the manifest with the project that is the source of the + # # merge request. This does not test the merged result but is the next best + # # thing we can do right now. + # - if: '$CI_PIPELINE_SOURCE == "merge_request_event"' + # variables: + # CI_ONIRO_REPO_WORKSPACE_LOCAL_MANIFEST_INTERPRETER: eval + # CI_ONIRO_REPO_WORKSPACE_LOCAL_MANIFEST: | + # cat <<__EOM__ + # <?xml version="1.0" encoding="UTF-8"?> + # <manifest> + # <!-- remove original docs project entry --> + # <remove-project name="oniro-core/docs.git" /> + # <!-- add remote representing the project --> + # <remote name="oniro-override" fetch="${CI_MERGE_REQUEST_SOURCE_PROJECT_URL}/../" /> + # <!-- add docs at the exact version are testing --> + # <project name="$(basename "$CI_MERGE_REQUEST_SOURCE_PROJECT_PATH")" path="docs" remote="oniro-override" revision="${CI_COMMIT_SHA}" /> + # </manifest> + # __EOM__ + # # Or when things land. + # - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' deploy: extends: .oniro-repo-workspace @@ -269,5 +269,5 @@ deploy: else echo "Nothing new to commit."; fi - rules: - - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' + # rules: + # - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH' -- GitLab