Verified Commit a8f47971 authored by Marek Pikuła's avatar Marek Pikuła
Browse files

Adjust to new namespace on GitLab.com 

Signed-off-by: default avatarMarek Pikuła <m.pikula@partner.samsung.com>
parent 0ba911e9

.gitlab-ci.d/main-generic.yml

+8 −1
Original line number Diff line number Diff line
@@ -10,6 +10,9 @@ 


spec:

  inputs:

    ci_path:

      description: ci-multiplatform upstream path (without prefix URL).



    # Instance runners

    runner_tag_amd64:

      description: Runner tag for regular x86_64 runners.
@@ -23,11 +26,13 @@ spec: 
      description: Pixman active targets pattern (instance-dependent).

    pixman_project:

      description: Pixman project path.

      default: marekpikula/pixman

    pixman_branch:

      description: Branch for Pixman tests.

---



variables:

  OCI_REGISTRY_IMAGE_LOCAL: ${CI_REGISTRY}/$[[ inputs.ci_path ]]



include:

  # Buildah base image.

  - local: "/.gitlab-ci.d/oci/buildah/buildah.yml"
@@ -68,6 +73,7 @@ include: 
    rules:

      - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH

    inputs:

      ci_path: $[[ inputs.ci_path ]]

      ci_branch: $CI_DEFAULT_BRANCH

      ci_image_tag: latest

      runner_tag_amd64: $[[ inputs.runner_tag_amd64 ]]
@@ -80,6 +86,7 @@ include: 
    rules:

      - if: $CI_PIPELINE_SOURCE == 'merge_request_event'

    inputs:

      ci_path: $[[ inputs.ci_path ]]

      ci_branch: $CI_COMMIT_REF_NAME

      ci_image_tag: $CI_COMMIT_REF_SLUG

      runner_tag_amd64: $[[ inputs.runner_tag_amd64 ]]

.gitlab-ci.d/main.yml

+7 −3
Original line number Diff line number Diff line
@@ -8,18 +8,22 @@ include: 
    rules:

      - if: $CI_SERVER_HOST == "gitlab.freedesktop.org"

    inputs:

      ci_path: marekpikula/ci-multiplatform

      runner_tag_amd64: ""

      runner_tag_qemu: "kvm"

      runner_tag_arm64: "aarch64"

      pixman_active_target_pattern: /linux-cross-mips|linux-native-(amd64|arm-v5|arm64-v8|mipsel|riscv64)|windows-cross-(amd64|arm64-v8)/

      pixman_branch: "ci-external"

      pixman_project: marekpikula/pixman

      pixman_branch: master



  - local: "/.gitlab-ci.d/main-generic.yml"

    rules:

      - if: $CI_SERVER_HOST == "gitlab.com"

    inputs:

      ci_path: riseproject/ci/ci-multiplatform

      runner_tag_amd64: "saas-linux-medium-amd64"

      runner_tag_qemu: "saas-linux-medium-amd64"

      runner_tag_arm64: "saas-linux-small-arm64"

      runner_tag_arm64: "saas-linux-medium-arm64"

      pixman_active_target_pattern: /linux-cross-mips|linux-native-(amd64|arm-v5|arm64-v8|riscv64)|windows-cross-(amd64|arm64-v8)/

      pixman_branch: "ci-external-gitlab"
 
      pixman_project: riseproject/ci/pixman

      pixman_branch: ci-external-gitlab

.gitlab-ci.d/tests/examples-local.yml

+3 −0
Original line number Diff line number Diff line 
spec:

  inputs:

    ci_path:

    ci_branch:

    ci_image_tag:

    runner_tag_amd64:
@@ -26,6 +27,7 @@ test:examples-oci: 
    include:

      - local: examples/oci/.gitlab-ci.yml

        inputs:

          ci_multiplatform_path: $[[ inputs.ci_path ]]

          ci_multiplatform_branch: $[[ inputs.ci_branch | expand_vars ]]

          ci_multiplatform_base_image_tag: $[[ inputs.ci_image_tag | expand_vars ]]

          runner_tag_amd64: $[[ inputs.runner_tag_amd64 ]]
@@ -53,6 +55,7 @@ test:examples-meson: 
    include:

      - local: examples/meson/.gitlab-ci.yml

        inputs:

          ci_multiplatform_path: $[[ inputs.ci_path ]]

          ci_multiplatform_branch: $[[ inputs.ci_branch | expand_vars ]]

          ci_multiplatform_base_image_tag: $[[ inputs.ci_image_tag | expand_vars ]]

          runner_tag_amd64: $[[ inputs.runner_tag_amd64 ]]

.gitlab-ci.d/tests/pixman.yml

+3 −0
Original line number Diff line number Diff line
@@ -3,6 +3,7 @@ spec: 
    pixman_active_target_pattern:

    pixman_project:

    pixman_branch:

    ci_path:

    ci_branch:

    ci_image_tag:

    runner_tag_amd64:
@@ -21,7 +22,9 @@ test:pixman: 
    inputs:

      active_target_pattern: $[[ inputs.pixman_active_target_pattern ]]

      oci_tag: test-ci-multiplatform-$[[ inputs.ci_branch | expand_vars ]]-$[[ inputs.ci_image_tag | expand_vars ]]

      ci_multiplatform_path: ${CI_SERVER_FQDN}/$[[ inputs.ci_path ]]

      ci_multiplatform_branch: $[[ inputs.ci_branch | expand_vars ]]

      ci_multiplatform_base_image_name: ${CI_REGISTRY}/$[[ inputs.ci_path ]]/debian/llvm-meson

      ci_multiplatform_image_tag: $[[ inputs.ci_image_tag | expand_vars ]]

      runner_tag_amd64: $[[ inputs.runner_tag_amd64 ]]

      runner_tag_qemu: $[[ inputs.runner_tag_qemu ]]

.gitlab-ci.d/tests/tests.yml

+3 −2
Original line number Diff line number Diff line 
spec:

  inputs:

    ci_path:

    ci_branch:

    ci_image_tag:

    runner_tag_amd64:
@@ -9,9 +10,7 @@ spec: 
    # Test-specific

    pixman_active_target_pattern:

    pixman_project:

      default: marekpikula/pixman

    pixman_branch:

      default: ci-external

---



include:
@@ -20,6 +19,7 @@ include: 
      pixman_active_target_pattern: $[[ inputs.pixman_active_target_pattern ]]

      pixman_project: $[[ inputs.pixman_project ]]

      pixman_branch: $[[ inputs.pixman_branch ]]

      ci_path: $[[ inputs.ci_path ]]

      ci_branch: $[[ inputs.ci_branch ]]

      ci_image_tag: $[[ inputs.ci_image_tag ]]

      runner_tag_amd64: $[[ inputs.runner_tag_amd64 ]]
@@ -28,6 +28,7 @@ include: 


  - local: "/.gitlab-ci.d/tests/examples-local.yml"

    inputs:

      ci_path: $[[ inputs.ci_path ]]

      ci_branch: $[[ inputs.ci_branch ]]

      ci_image_tag: $[[ inputs.ci_image_tag ]]

      runner_tag_amd64: $[[ inputs.runner_tag_amd64 ]]