File tree 3 files changed +28
-5
lines changed
test/integration/features/support
3 files changed +28
-5
lines changed Original file line number Diff line number Diff line change 1
- name : End -to-end test
1
+ name : Integration and end -to-end tests
2
2
3
3
on :
4
4
pull_request :
10
10
default : false
11
11
12
12
jobs :
13
- e2e-test :
13
+ tests :
14
14
runs-on : ubuntu-latest
15
15
16
16
steps :
@@ -27,11 +27,17 @@ jobs:
27
27
with :
28
28
node-version : 18
29
29
30
- - name : Install system dependencies for end-to-end tests
30
+ - name : Install system dependencies for tests
31
31
run : build/ci/install-dependencies.sh
32
32
shell : bash
33
33
34
- - name : Enable perf tests
34
+ - name : Run integration tests
35
+ run : |
36
+ # Ensure only integration tests that are supported in CI are run using
37
+ # the --ci flag.
38
+ make integration-test INTEGRATION_FLAGS="--ci"
39
+
40
+ - name : Enable end-to-end perf tests
35
41
if : ${{ github.event.inputs.run-all }}
36
42
run : echo "E2E_FLAGS='--all'" >> $GITHUB_ENV
37
43
Original file line number Diff line number Diff line change 3
3
THISDIR=" $( cd " $( dirname " $0 " ) " ; pwd -P ) "
4
4
TESTDIR=" $THISDIR /../test/integration"
5
5
6
+ # Defaults
7
+ ARGS=()
8
+
9
+ # Parse script arguments
10
+ for i in " $@ "
11
+ do
12
+ case " $i " in
13
+ --ci)
14
+ ARGS+=(" -p" " ci" )
15
+ shift # past argument
16
+ ;;
17
+ * )
18
+ die " unknown option '$i '"
19
+ ;;
20
+ esac
21
+ done
22
+
6
23
# Exit as soon as any line fails
7
24
set -e
8
25
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ export function getSystemDDaemonState(): DaemonState {
50
50
function parseOutput ( stdout : string , regex : RegExp ) : string {
51
51
var potentialMatchParts = stdout . match ( regex )
52
52
if ( potentialMatchParts ) {
53
- return potentialMatchParts [ 1 ]
53
+ return potentialMatchParts [ 1 ]
54
54
}
55
55
else {
56
56
return 'not started'
You can’t perform that action at this time.
0 commit comments