Skip to content

Commit f45fff0

Browse files
committed
WIP: Demonstrate that repo configured with gitlab-ci.yml can run salsa-ci.yml
1 parent 67d0670 commit f45fff0

File tree

2 files changed

+48
-41
lines changed

2 files changed

+48
-41
lines changed

debian/gitlab-ci.yml

Lines changed: 5 additions & 41 deletions
Original file line numberDiff line numberDiff line change
@@ -1,43 +1,7 @@
1-
# DO NOT MODIFY
2-
# This file was automatically generated from authoritative copy at:
3-
# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go
41
---
5-
stages:
6-
- test
7-
- package
8-
2+
# This 'gitlab-ci.yml' file exists for the sole purpose of loading
3+
# 'salsa-ci.yml' in case the GitLab repository is still configured to use old
4+
# name 'gitlab-ci.yml'. Please migrate to use 'salsa-ci.yml' and delete this
5+
# file.
96
include:
10-
- project: go-team/infra/pkg-go-tools
11-
ref: master
12-
file: pipeline/test-archive.yml
13-
# Run the Go team CI only in the go-team project that has access to GitLab
14-
# CI runners tagged 'go-ci'
15-
rules:
16-
- if: $CI_PROJECT_ROOT_NAMESPACE == "go-team"
17-
18-
# Additionally run Salsa CI only if the Play button is pressed on the pipeline
19-
Salsa CI:
20-
stage: package
21-
trigger:
22-
include:
23-
- project: salsa-ci-team/pipeline
24-
ref: master
25-
file: recipes/debian.yml
26-
strategy: depend
27-
rules:
28-
- if: $CI_PIPELINE_SOURCE == "push" # Only trigger pipelines on pushes
29-
when: manual
30-
- if: $CI_PIPELINE_SOURCE == "merge_request_event" # Or on merge requests
31-
when: always
32-
variables:
33-
SALSA_CI_DISABLE_REPROTEST: 1 # Disable to save CI runner resources
34-
35-
# If Salsa CI is not running at
36-
# https://salsa.debian.org/%{project_path}/-/pipelines, ensure that
37-
# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has in field "CI/CD
38-
# configuration file" the same filename as this file.
39-
#
40-
# If Salsa CI is running, but first job is stuck because the project doesn't
41-
# have any runners online assigned to it, ensure that
42-
# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has under "Runners"
43-
# the setting for "Enable instance runners for this project" enabled.
7+
- local: 'debian/salsa-ci.yml'

debian/salsa-ci.yml

Lines changed: 43 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,43 @@
1+
# DO NOT MODIFY
2+
# This file was automatically generated from authoritative copy at:
3+
# https://salsa.debian.org/go-team/infra/pkg-go-tools/blob/master/config/gitlabciyml.go
4+
---
5+
stages:
6+
- test
7+
- package
8+
9+
include:
10+
- project: go-team/infra/pkg-go-tools
11+
ref: master
12+
file: pipeline/test-archive.yml
13+
# Run the Go team CI only in the go-team project that has access to GitLab
14+
# CI runners tagged 'go-ci'
15+
rules:
16+
- if: $CI_PROJECT_ROOT_NAMESPACE == "go-team"
17+
18+
# Additionally run Salsa CI only if the Play button is pressed on the pipeline
19+
Salsa CI:
20+
stage: package
21+
trigger:
22+
include:
23+
- project: salsa-ci-team/pipeline
24+
ref: master
25+
file: recipes/debian.yml
26+
strategy: depend
27+
rules:
28+
- if: $CI_PIPELINE_SOURCE == "push" # Only trigger pipelines on pushes
29+
when: manual
30+
- if: $CI_PIPELINE_SOURCE == "merge_request_event" # Or on merge requests
31+
when: always
32+
variables:
33+
SALSA_CI_DISABLE_REPROTEST: 1 # Disable to save CI runner resources
34+
35+
# If Salsa CI is not running at
36+
# https://salsa.debian.org/%{project_path}/-/pipelines, ensure that
37+
# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has in field "CI/CD
38+
# configuration file" the same filename as this file.
39+
#
40+
# If Salsa CI is running, but first job is stuck because the project doesn't
41+
# have any runners online assigned to it, ensure that
42+
# https://salsa.debian.org/%{project_path}/-/settings/ci_cd has under "Runners"
43+
# the setting for "Enable instance runners for this project" enabled.

0 commit comments

Comments
 (0)