Skip to content

Commit c60fe70

Browse files
committed
CLEANUP/MINOR: tests: use most recent bats in CI
1 parent 548fc14 commit c60fe70

File tree

3 files changed

+7
-5
lines changed

3 files changed

+7
-5
lines changed

.gitlab-ci.yml

+3-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ stages:
55
variables:
66
DOCKER_HOST: tcp://docker:2375
77
DOCKER_BASE_IMAGE: $CI_REGISTRY_GO/haproxy-alpine
8+
BATS_VERSION: v1.4.1
89

910
golangci-lint:
1011
stage: lint
@@ -65,7 +66,8 @@ build:
6566
tags:
6667
- go
6768
before_script:
68-
- apk add git bash curl jq bats
69+
- apk add git bash curl jq git
70+
- git clone https://github.com/bats-core/bats-core.git && cd bats-core && git checkout $BATS_VERSION && ./install.sh /usr/local && cd ..
6971
- docker login -u gitlab-ci-token -p $CI_BUILD_TOKEN $CI_REGISTRY_GO
7072
script:
7173
- bash -x ./e2e/run.bash

e2e/tests/server_templates/create.bats

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ load '../../libs/version'
2323

2424
load 'utils/_helpers'
2525

26-
@test "server_templates: Add a new server template" {
26+
@test "server_templates: Add a new server template 1" {
2727
resource_post "$_SERVER_TEMPLATE_BASE_PATH" "data/first/post.json" "backend=test_backend&force_reload=true"
2828
assert_equal "$SC" 201
2929

@@ -36,7 +36,7 @@ load 'utils/_helpers'
3636
assert_equal "443" "$(get_json_path "$BODY" '.data.port')"
3737
}
3838

39-
@test "server_templates: Add a new server template" {
39+
@test "server_templates: Add a new server template 2" {
4040
resource_post "$_SERVER_TEMPLATE_BASE_PATH" "data/second/post.json" "backend=test_backend&force_reload=true"
4141
assert_equal "$SC" 201
4242

e2e/tests/server_templates/delete.bats

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,12 +23,12 @@ load '../../libs/version'
2323

2424
load 'utils/_helpers'
2525

26-
@test "server_templates: Delete a server template" {
26+
@test "server_templates: Delete a server template 1" {
2727
resource_delete "$_SERVER_TEMPLATE_BASE_PATH/srv_google" "backend=test_backend&force_reload=true"
2828
assert_equal "$SC" 204
2929
}
3030

31-
@test "server_templates: Delete a server template" {
31+
@test "server_templates: Delete a server template 2" {
3232
resource_delete "$_SERVER_TEMPLATE_BASE_PATH/srv_bing" "backend=test_backend&force_reload=true"
3333
assert_equal "$SC" 204
3434
}

0 commit comments

Comments
 (0)