[ci] Add 'ci::web only' tag and pipeline.

.gitlab-ci.yml

@@ -22,16 +22,23 @@ workflow:
       when: never
     - if: "$CI_MERGE_REQUEST_LABELS =~ /.*(workflow::paused|ci skip).*/"
       when: never
+    - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::web only.*/
+      variables:
+        WEB_ONLY: "true"
+        CTEST_INCLUDE_REGEX: "nb-"
     - if: $CI_MERGE_REQUEST_IID # merge requests
     - if: $CI_COMMIT_TAG # tags, ogs/ogs repo only
     - if: '$CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_PROJECT_PATH == "ogs/ogs"' # master, ogs/ogs repo only
     - if: '$CI_COMMIT_BRANCH =~ /^v[0-9]\.[0-9]\.[0-9]/ && $CI_PROJECT_PATH == "ogs/ogs"' # release branches, e.g. v6.x.x
 
 include:
-  - local: "/scripts/ci/extends/*.yml"
+  - local: "scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/pipelines/web.yml"
+    rules:
+      - if: $CI_MERGE_REQUEST_LABELS =~ /.*ci::web only.*/
   - local: "/scripts/ci/pipelines/regular.yml"
     rules:
-      - if: $CI_PIPELINE_SOURCE != schedule
+      - if: $CI_PIPELINE_SOURCE != "schedule" && $CI_MERGE_REQUEST_LABELS !~ /.*ci::web only.*/
   - local: "/scripts/ci/pipelines/scheduled.yml"
     rules:
-      - if: $CI_PIPELINE_SOURCE == schedule
+      - if: '$CI_PIPELINE_SOURCE == "schedule"'

scripts/ci/jobs/build-linux-arch.yml

+build linux arch:
+  extends:
+    - .template-build-linux
+    - .test-artifacts
+  tags: [shell, envinf23]
+  needs: [meta]
+  timeout: 2h
+  variables:
+    BUILD_CTEST_LARGE_ON_MASTER: "true"
+    CMAKE_PRESET: release-all
+    CMAKE_ARGS: >-
+      -DBUILD_SHARED_LIBS=ON
+      -DOGS_USE_MKL=ON

scripts/ci/jobs/build-linux.yml

@@ -62,20 +62,6 @@ build linux (no deps, no procs):
     CMAKE_ARGS: -DOGS_BUILD_PROCESSES=SteadyStateDiffusion
     CMAKE_PRESET: ci-simplest
 
-build linux arch:
-  extends:
-    - .template-build-linux
-    - .test-artifacts
-  tags: [shell, envinf23]
-  needs: [meta]
-  timeout: 2h
-  variables:
-    BUILD_CTEST_LARGE_ON_MASTER: "true"
-    CMAKE_PRESET: release-all
-    CMAKE_ARGS: >-
-      -DBUILD_SHARED_LIBS=ON
-      -DOGS_USE_MKL=ON
-
 build linux debug with sanitizers:
   extends:
     - .template-build-linux

scripts/ci/jobs/web.yml → scripts/ci/jobs/web-check.yml

@@ -28,65 +28,3 @@ check web links:
       --ignore-url='www.smartkd-concept.de'
       http://localhost:1313
     - kill $!
-
-preview web site:
-  stage: build
-  image: $WEB_IMAGE
-  needs: [ci_images, "build linux arch", "build linux petsc"]
-  variables:
-    HUGO_ENVIRONMENT: "staging"
-  script:
-    # Copy notebook pages
-    - cp -rl build/*/web/content web/
-    - cd web
-    # Symlink for prj link checks (data-link shortcode)
-    - ln -s ../Tests .
-    - yarn
-    - yarn build
-  rules:
-    - if: $CI_MERGE_REQUEST_ID
-      changes:
-        - web/**/*
-        - scripts/ci/jobs/web.yml
-        - Tests/Data/**/*.ipynb
-  artifacts:
-    paths:
-      - web/public
-    expire_in: 1 week
-  environment:
-    name: web preview $CI_MERGE_REQUEST_IID
-    url: ${ARTIFACTS_PAGES_URL}/web/public/index.html
-  cache:
-    paths:
-      - web/node_modules
-
-deploy web site:
-  stage: package
-  image: $WEB_IMAGE
-  needs:
-    - job: ci_images
-    - job: "build linux arch"
-    - job: "build linux petsc"
-    - job: release
-      optional: true
-  rules:
-    - if: $CI_COMMIT_TAG
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      changes:
-        - web/**/*
-        - scripts/ci/jobs/web.yml
-        - Tests/Data/**/*.ipynb
-    - if: '$CI_COMMIT_BRANCH == "master"'
-      when: manual
-      allow_failure: true
-  script:
-    # Copy notebook pages
-    - cp -rl build/*/web/content web/
-    - cd web
-    - yarn
-    - yarn build
-    - netlify deploy --prod --dir=public --site=$OGS_NETLIFY_SITE_ID
-    - yarn upload-index
-  cache:
-    paths:
-      - web/node_modules

scripts/ci/jobs/web-deploy.yml

+deploy web site:
+  stage: package
+  image: $WEB_IMAGE
+  needs:
+    - job: ci_images
+    - job: "build linux arch"
+    - job: "build linux petsc"
+    - job: release
+      optional: true
+  rules:
+    - if: $CI_COMMIT_TAG
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      changes:
+        - web/**/*
+        - scripts/ci/jobs/web.yml
+        - Tests/Data/**/*.ipynb
+    - if: '$CI_COMMIT_BRANCH == "master"'
+      when: manual
+      allow_failure: true
+  script:
+    # Copy notebook pages
+    - cp -rl build/*/web/content web/
+    - cd web
+    - yarn
+    - yarn build
+    - netlify deploy --prod --dir=public --site=$OGS_NETLIFY_SITE_ID
+    - yarn upload-index
+  cache:
+    paths:
+      - web/node_modules

scripts/ci/jobs/web-preview.yml

+preview web site:
+  stage: build
+  image: $WEB_IMAGE
+  needs: [ci_images, "build linux arch", "build linux petsc"]
+  variables:
+    HUGO_ENVIRONMENT: "staging"
+  script:
+    # Copy notebook pages
+    - cp -rl build/*/web/content web/
+    - cd web
+    # Symlink for prj link checks (data-link shortcode)
+    - ln -s ../Tests .
+    - yarn
+    - yarn build
+  rules:
+    - if: $CI_MERGE_REQUEST_ID
+      changes:
+        - web/**/*
+        - scripts/ci/jobs/web.yml
+        - Tests/Data/**/*.ipynb
+  artifacts:
+    paths:
+      - web/public
+    expire_in: 1 week
+  environment:
+    name: web preview $CI_MERGE_REQUEST_IID
+    url: ${ARTIFACTS_PAGES_URL}/web/public/index.html
+  cache:
+    paths:
+      - web/node_modules

scripts/ci/pipelines/regular.yml

@@ -4,6 +4,7 @@ include:
   # jobs, can be indiviually disabled for testing
   - local: "/scripts/ci/jobs/pre-commit.yml"
   - local: "/scripts/ci/jobs/build-linux.yml"
+  - local: "/scripts/ci/jobs/build-linux-arch.yml"
   - local: "/scripts/ci/jobs/build-linux-petsc.yml"
   - local: "/scripts/ci/jobs/build-linux-frontend.yml"
   - local: "/scripts/ci/jobs/build-docs.yml"
@@ -20,7 +21,9 @@ include:
   - local: "/scripts/ci/jobs/include-what-you-use.yml"
   - local: "/scripts/ci/jobs/clang-sanitizer.yml"
   - local: "/scripts/ci/jobs/clang-tidy.yml"
-  - local: "/scripts/ci/jobs/web.yml"
+  - local: "/scripts/ci/jobs/web-preview.yml"
+  - local: "/scripts/ci/jobs/web-check.yml"
+  - local: "/scripts/ci/jobs/web-deploy.yml"
   - local: "/scripts/ci/jobs/container.yml"
   - local: "/scripts/ci/jobs/release.yml"
   - local: "/scripts/ci/jobs/package.yml"

scripts/ci/pipelines/web.yml

+include:
+  - local: "/scripts/ci/extends/*.yml"
+  - local: "/scripts/ci/jobs/meta.yml"
+  - local: "/scripts/ci/jobs/ci_images.yml"
+  - local: "/scripts/ci/jobs/build-linux-arch.yml"
+  - local: "/scripts/ci/jobs/build-linux-petsc.yml"
+  - local: "/scripts/ci/jobs/web-preview.yml"