From: Michael Hofmann <mhofmann@xxxxxxxxxx>
Simplify documentation jobs
Signed-off-by: Michael Hofmann <mhofmann@xxxxxxxxxx>
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index blahblah..blahblah 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -14,11 +14,6 @@ include:
file: .gitlab/ci_templates/interruptible.yml
if: $CI_PIPELINE_SOURCE == "merge_request_event"
-stages:
- - test
- - build
- - deploy
-
workflow:
rules:
# ARK release pipelines
@@ -36,6 +31,10 @@ workflow:
only-os-build-head: &only-os-build-head
if: $CI_COMMIT_BRANCH != "os-build" || $CI_PIPELINE_SOURCE !~ /push|web/
when: never
+ only-os-build-head-mr: &only-os-build-head-mr
+ if: ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME != "os-build") &&
+ ($CI_COMMIT_BRANCH != "os-build" || $CI_PIPELINE_SOURCE !~ /push|web/)
+ when: never
only-os-build-schedule: &only-os-build-schedule
if: $CI_COMMIT_BRANCH != "os-build" || $CI_PIPELINE_SOURCE != "schedule"
when: never
@@ -44,6 +43,10 @@ workflow:
when: never
on-success: &on-success
when: on_success
+ manual-on-mr: &manual-on-mr
+ if: $CI_PIPELINE_SOURCE == "merge_request_event"
+ when: manual
+ allow_failure: true
manual-for-bot: &manual-for-bot
if: $CI_COMMIT_AUTHOR =~ /<kernel-team@xxxxxxxxxxxxxxxxx>/
when: manual
@@ -300,45 +303,28 @@ test_makefile:
- *only-os-build-mr
- *on-success
-test_docs:
- stage: test
- image: quay.io/cki/python:production
- before_script:
- - python3 -m venv ~/docs-venv
- - source ~/docs-venv/bin/activate
- - pip install sphinx
- - cd redhat/docs/
- script: make SPHINXOPTS="-W" html
- rules:
- - *only-os-build-mr
- - *on-success
-
docs:
- stage: build
- image: quay.io/cki/python:production
- before_script:
- - python3 -m venv ~/docs-venv
- - source ~/docs-venv/bin/activate
+ image: quay.io/cki/cki-tools:production
+ script:
- pip install sphinx
- cd redhat/docs/
- script: make SPHINXOPTS="-W" html
+ - make SPHINXOPTS="-W" html
artifacts:
paths:
- redhat/docs/_build/html/
rules:
- - *only-os-build-head
+ - *only-os-build-head-mr
- *on-success
pages:
- stage: deploy
- image: quay.io/cki/python:production
- dependencies:
- - docs
+ image: quay.io/cki/cki-tools:production
+ needs: [docs]
script:
- mv redhat/docs/_build/html/ public/
artifacts:
paths:
- public
rules:
- - *only-os-build-head
+ - *only-os-build-head-mr
+ - *manual-on-mr
- *on-success
--
https://gitlab.com/cki-project/kernel-ark/-/merge_requests/2598
_______________________________________________
kernel mailing list -- kernel@xxxxxxxxxxxxxxxxxxxxxxx
To unsubscribe send an email to kernel-leave@xxxxxxxxxxxxxxxxxxxxxxx
Fedora Code of Conduct: https://docs.fedoraproject.org/en-US/project/code-of-conduct/
List Guidelines: https://fedoraproject.org/wiki/Mailing_list_guidelines
List Archives: https://lists.fedoraproject.org/archives/list/kernel@xxxxxxxxxxxxxxxxxxxxxxx
Do not reply to spam, report it: https://pagure.io/fedora-infrastructure/new_issue
