File tree Expand file tree Collapse file tree 5 files changed +34
-9
lines changed Expand file tree Collapse file tree 5 files changed +34
-9
lines changed Original file line number Diff line number Diff line change 12
12
- ' CHANGELOG.md'
13
13
- ' CONTRIBUTING.md'
14
14
15
- concurrency :
15
+ concurrency :
16
16
group : ${{ github.workflow }}-${{ github.event.pull_request.number }}
17
17
cancel-in-progress : true
18
18
31
31
timeout-minutes : 60
32
32
runs-on : ubuntu-latest
33
33
needs : [go-version]
34
+ strategy :
35
+ fail-fast : false
36
+ matrix :
37
+ gitlab-version : ["14.9.4-ce.0", "14.10.3-ce.0", "15.0.0-ce.0"]
34
38
steps :
35
39
- uses : actions/setup-go@v3
36
40
with :
41
45
with :
42
46
path : ~/go/pkg/mod
43
47
key : ${{ github.job }}-${{ runner.os }}-go${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum', 'GNUMakefile') }}
44
- - run : make testacc-up
48
+ - run : make testacc-up GITLAB_CE_VERSION=${{ matrix.gitlab-version }}
45
49
- run : make testacc
Original file line number Diff line number Diff line change 26
26
# Disable permissions on the GITHUB_TOKEN for all scopes.
27
27
permissions : {}
28
28
29
- concurrency :
29
+ concurrency :
30
30
group : ${{ github.workflow }}-${{ github.event.pull_request.number }}
31
31
cancel-in-progress : true
32
32
65
65
timeout-minutes : 60
66
66
runs-on : ubuntu-latest
67
67
needs : [go-version, license-encryption-password]
68
+ strategy :
69
+ fail-fast : false
70
+ matrix :
71
+ gitlab-version : ["14.9.4-ee.0", "14.10.3-ee.0", "15.0.0-ee.0"]
68
72
steps :
69
73
- uses : actions/setup-go@v3
70
74
with :
79
83
run : |
80
84
openssl version
81
85
openssl enc -d -aes-256-cbc -pbkdf2 -iter 20000 -in Gitlab-license.encrypted -out Gitlab-license.txt -pass "pass:${{ secrets.LICENSE_ENCRYPTION_PASSWORD }}"
82
- - run : make testacc-up SERVICE=gitlab-ee
86
+ - run : make testacc-up SERVICE=gitlab-ee GITLAB_EE_VERSION=${{ matrix.gitlab-version }}
83
87
# Check out the pull request code (as opposed to the target project).
84
88
# This overwrites the entire directory and deleted the unencrypted GitLab license file. The
85
89
# service has already started and continues using the license even though the file is deleted.
96
100
# This is made safe because we have already cleaned up the unencrypted GitLab license file,
97
101
# we have no other secrets, and we are not using GitHub tokens.
98
102
- run : make testacc
99
-
Original file line number Diff line number Diff line change 94
94
timeout-minutes : 60
95
95
runs-on : ubuntu-latest
96
96
needs : [go-version]
97
+ strategy :
98
+ fail-fast : false
99
+ matrix :
100
+ gitlab-version : ["14.9.4-ce.0", "14.10.3-ce.0", "15.0.0-ce.0"]
97
101
steps :
98
102
- uses : actions/setup-go@v3
99
103
with :
@@ -104,7 +108,7 @@ jobs:
104
108
with :
105
109
path : ~/go/pkg/mod
106
110
key : ${{ github.job }}-${{ runner.os }}-go${{ env.GO_VERSION }}-${{ hashFiles('**/go.sum', 'GNUMakefile') }}
107
- - run : make testacc-up
111
+ - run : make testacc-up GITLAB_CE_VERSION=${{ matrix.gitlab-version }}
108
112
- run : make testacc
109
113
110
114
acceptance-ee :
@@ -114,6 +118,10 @@ jobs:
114
118
timeout-minutes : 60
115
119
runs-on : ubuntu-latest
116
120
needs : [go-version, license-encryption-password]
121
+ strategy :
122
+ fail-fast : false
123
+ matrix :
124
+ gitlab-version : ["14.9.4-ee.0", "14.10.3-ee.0", "15.0.0-ee.0"]
117
125
steps :
118
126
- uses : actions/setup-go@v3
119
127
with :
@@ -129,5 +137,5 @@ jobs:
129
137
openssl version
130
138
openssl enc -d -aes-256-cbc -pbkdf2 -iter 20000 -in Gitlab-license.encrypted -out Gitlab-license.txt -pass "pass:${{ secrets.LICENSE_ENCRYPTION_PASSWORD }}"
131
139
# Note we specifically launch the gitlab-ee service.
132
- - run : make testacc-up SERVICE=gitlab-ee
140
+ - run : make testacc-up SERVICE=gitlab-ee GITLAB_EE_VERSION=${{ matrix.gitlab-version }}
133
141
- run : make testacc
Original file line number Diff line number Diff line change @@ -108,6 +108,8 @@ Your workspace will automatically open the repository and branch that you select
108
108
109
109
The acceptance tests can run against a Gitlab instance where you have a token with administrator permissions (likely not gitlab.com).
110
110
111
+ The GitHub Actions test against the three latest GitLab releases.
112
+
111
113
#### Option 1: Run tests against a local Gitlab container with docker-compose
112
114
113
115
This option is the easiest and requires [ docker-compose] ( https://docs.docker.com/compose/install/ ) (version 1.13+) to be installed on your machine.
@@ -162,6 +164,14 @@ $ make testacc GITLAB_TOKEN=example123 GITLAB_BASE_URL=https://example.com/api/v
162
164
$ make testacc-up SERVICE=gitlab-ee
163
165
```
164
166
167
+ * ** Run tests against specific GitLab version:**
168
+
169
+ Specify the GitLab release in the ` GITLAB_CE_VERSION ` or ` GITLAB_EE_VERSION ` , e.g.:
170
+
171
+ ``` sh
172
+ $ make testacc-up GITLAB_CE_VERSION=15.0.0-ce.0
173
+ ```
174
+
165
175
* ** Run a single test:**
166
176
167
177
You can pass a pattern to the ` RUN ` variable to run a reduced number of tests. For example:
Original file line number Diff line number Diff line change @@ -4,7 +4,7 @@ version: '3'
4
4
# Only one of these services should be run at a time.
5
5
services :
6
6
gitlab-ce :
7
- image : gitlab/gitlab-ce
7
+ image : gitlab/gitlab-ce:${GITLAB_CE_VERSION:-latest}
8
8
restart : always
9
9
ports :
10
10
- 8080:80
@@ -25,7 +25,7 @@ services:
25
25
timeout : 2m
26
26
27
27
gitlab-ee :
28
- image : gitlab/gitlab-ee
28
+ image : gitlab/gitlab-ee:${GITLAB_EE_VERSION:-latest}
29
29
restart : always
30
30
ports :
31
31
- 8080:80
You can’t perform that action at this time.
0 commit comments