Skip to content

Commit 260a157

Browse files
marccampbellmarccampbell
authored
Merge pull request #210 from replicatedhq/tests-redo
Add some additional pacts
2 parents 4de8eed + 71c4f0c commit 260a157

27 files changed

+1115
-1455
lines changed

‎.github/workflows/main.yml‎

Lines changed: 15 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -9,41 +9,26 @@ on:
99
- '!**.png'
1010

1111
jobs:
12+
1213
make-tests:
13-
runs-on: ubuntu-latest
14+
runs-on: ubuntu-20.04
1415
steps:
15-
- uses: actions/checkout@v2
16+
- uses: actions/checkout@v3
17+
- uses: actions/setup-go@v3
18+
- name: Install pact
19+
run: |
20+
curl -LO https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.91.0/pact-1.91.0-linux-x86_64.tar.gz
21+
tar -zxvf pact-1.91.0-linux-x86_64.tar.gz
22+
sudo mv pact /usr/local/bin
23+
echo "/usr/local/bin/pact/bin" >> $GITHUB_PATH
1624
- name: make test
1725
run: make test
18-
env:
19-
REPLICATED_API_ORIGIN: https://api.replicated.com/vendor
20-
REPLICATED_ID_ORIGIN: https://id.replicated.com
21-
VENDOR_USER_EMAIL: [email protected]
22-
VENDOR_USER_PASSWORD: ${{ secrets.VENDOR_USER_PASSWORD }}
23-
REPLICATED_API_TOKEN: ${{ secrets.REPLICATED_API_TOKEN }}
2426
make-build:
25-
runs-on: ubuntu-latest
27+
runs-on: ubuntu-20.04
2628
steps:
27-
- uses: actions/checkout@v2
29+
- uses: actions/checkout@v3
30+
- uses: actions/setup-go@v3
31+
with:
32+
go-version: '^1.18'
2833
- name: make build
2934
run: make build
30-
snyk-test:
31-
runs-on: ubuntu-latest
32-
steps:
33-
- uses: actions/checkout@v2
34-
- name: Run Snyk to check for vulnerabilities
35-
uses: snyk/actions/golang@master
36-
env:
37-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
38-
with:
39-
command: test
40-
snyk-monitor:
41-
runs-on: ubuntu-latest
42-
steps:
43-
- uses: actions/checkout@v2
44-
- name: Run Snyk to check for vulnerabilities
45-
uses: snyk/actions/golang@master
46-
env:
47-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
48-
with:
49-
command: monitor

‎.github/workflows/release.yml‎

Lines changed: 19 additions & 42 deletions
Original file line numberDiff line numberDiff line change
@@ -9,74 +9,51 @@ on:
99
# and no really rock-solid way to use an `if` property to limit to tag creation
1010
jobs:
1111
make-pacts:
12-
runs-on: ubuntu-latest
12+
runs-on: ubuntu-20.04
1313
steps:
14-
- uses: actions/checkout@v2
14+
- uses: actions/checkout@v3
1515
- name: make pacts
1616
run: make pacts
1717
make-tests:
18-
runs-on: ubuntu-latest
18+
runs-on: ubuntu-20.04
1919
steps:
20-
- uses: actions/checkout@v2
21-
- uses: actions/setup-go@v2
22-
with:
23-
go-version: '^1.17.4'
20+
- uses: actions/checkout@v3
21+
- uses: actions/setup-go@v3
22+
- name: Install pact
23+
run: |
24+
curl -LO https://github.com/pact-foundation/pact-ruby-standalone/releases/download/v1.91.0/pact-1.91.0-linux-x86_64.tar.gz
25+
tar -zxvf pact-1.91.0-linux-x86_64.tar.gz
26+
sudo mv pact /usr/local/bin
27+
echo "/usr/local/bin/pact/bin" >> $GITHUB_PATH
2428
- name: make test
2529
run: make test
26-
env:
27-
REPLICATED_API_ORIGIN: https://api.replicated.com/vendor
28-
REPLICATED_ID_ORIGIN: https://id.replicated.com
29-
VENDOR_USER_EMAIL: [email protected]
30-
VENDOR_USER_PASSWORD: ${{ secrets.VENDOR_USER_PASSWORD }}
31-
REPLICATED_API_TOKEN: ${{ secrets.REPLICATED_API_TOKEN }}
3230
make-build:
33-
runs-on: ubuntu-latest
31+
runs-on: ubuntu-20.04
3432
steps:
35-
- uses: actions/checkout@v2
33+
- uses: actions/checkout@v3
3634
- name: make build
3735
run: make build
38-
snyk-test:
39-
runs-on: ubuntu-latest
40-
steps:
41-
- uses: actions/checkout@v2
42-
- name: Run Snyk to check for vulnerabilities
43-
uses: snyk/actions/golang@master
44-
env:
45-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
46-
with:
47-
command: test
48-
snyk-monitor:
49-
runs-on: ubuntu-latest
50-
steps:
51-
- uses: actions/checkout@v2
52-
- name: Run Snyk to check for vulnerabilities
53-
uses: snyk/actions/golang@master
54-
env:
55-
SNYK_TOKEN: ${{ secrets.SNYK_TOKEN }}
56-
with:
57-
command: monitor
36+
5837
create-release:
59-
runs-on: ubuntu-latest
38+
runs-on: ubuntu-20.04
6039
needs:
6140
- make-pacts
6241
- make-tests
6342
- make-build
64-
- snyk-test
65-
- snyk-monitor
6643
steps:
67-
- uses: actions/checkout@v2
44+
- uses: actions/checkout@v3
6845
with:
6946
fetch-depth: 0
7047
- name: Set up Go
71-
uses: actions/setup-go@v2
48+
uses: actions/setup-go@v3
7249
with:
73-
go-version: 1.17
50+
go-version: '^1.18'
7451
- name: docker login
7552
run: docker login -u="$DOCKERHUB_DOCKER_USER" -p="$DOCKERHUB_DOCKER_PASS"
7653
env:
7754
DOCKERHUB_DOCKER_USER: ${{ secrets.DOCKERHUB_USER }}
7855
DOCKERHUB_DOCKER_PASS: ${{ secrets.DOCKERHUB_PASSWORD }}
7956
- name: run goreleaser
80-
run: curl -sL https://git.io/goreleaser | VERSION=v1.6.1 bash
57+
run: curl -sL https://git.io/goreleaser | VERSION=v1.6.1 bash
8158
env:
8259
GITHUB_TOKEN: ${{ secrets.HOMEBREW_TAP_GITHUB_TOKEN }}

‎Makefile‎

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -47,26 +47,16 @@ deps:
4747
--volume `pwd`:/go/src/github.com/replicatedhq/replicated \
4848
replicatedhq.replicated glide install
4949

50-
.PHONY: test-env
51-
test-env:
52-
@if [ -z "${REPLICATED_API_TOKEN}" ]; then echo "Missing REPLICATED_API_TOKEN"; exit 1; fi
53-
@if [ -z "${VENDOR_USER_PASSWORD}" ]; then echo "Missing VENDOR_USER_PASSWORD"; exit 1; fi
54-
@if [ -z "${VENDOR_USER_EMAIL}" ]; then echo "Missing VENDOR_USER_EMAIL"; exit 1; fi
55-
@if [ -z "${REPLICATED_API_ORIGIN}" ]; then echo "Missing REPLICATED_API_ORIGIN"; exit 1; fi
56-
@if [ -z "${REPLICATED_ID_ORIGIN}" ]; then echo "Missing REPLICATED_ID_ORIGIN"; exit 1; fi
57-
5850
.PHONY: test
59-
test: test-env
51+
test:
52+
# pacts and unit
53+
go test -v ./...
54+
55+
# integration and e2e
6056
docker build -t replicated-cli-test -f hack/Dockerfile.testing .
6157
docker run --rm --name replicated-cli-tests \
6258
-v `pwd`:/go/src/github.com/replicatedhq/replicated \
63-
-e REPLICATED_API_ORIGIN \
64-
-e REPLICATED_ID_ORIGIN \
65-
-e VENDOR_USER_EMAIL \
66-
-e VENDOR_USER_PASSWORD \
67-
-e REPLICATED_API_TOKEN \
6859
replicated-cli-test \
69-
go test -v ./...
7060

7161

7262
.PHONY: publish-pacts

‎cli/test/channel_releases_test.go‎

Lines changed: 0 additions & 90 deletions
This file was deleted.

‎cli/test/channel_rm_test.go‎

Lines changed: 0 additions & 79 deletions
This file was deleted.

0 commit comments

Comments
 (0)