Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

chore(ci): fix arm workflows + minor CI cleanup #8436

Merged
merged 11 commits into from
Nov 18, 2022
Merged

chore(ci): fix arm workflows + minor CI cleanup #8436

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
f660be2
chore(ci): skip systest and graphql for arm
joshua-goldstein Nov 16, 2022
e46c6ba
refine skiplist
joshua-goldstein Nov 16, 2022
e314deb
add another minio skip
joshua-goldstein Nov 16, 2022
06a5530
modify workflow
joshua-goldstein Nov 16, 2022
8425e25
cd into t
joshua-goldstein Nov 16, 2022
70d4089
change target
joshua-goldstein Nov 16, 2022
dd8a987
add comment and rename
joshua-goldstein Nov 18, 2022
ced1cb8
cleanup
joshua-goldstein Nov 18, 2022
b01cd53
apply changes to other ci workflow
joshua-goldstein Nov 18, 2022
05c45bf
apply changes to load
joshua-goldstein Nov 18, 2022
918239d
sec diff
joshua-goldstein Nov 18, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/ci-aqua-security-trivy-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ jobs:
uses: actions/checkout@v3
- name: Build Docker image
run: |
make image-local
make docker-image
- name: Run Trivy vulnerability scanner
uses: aquasecurity/trivy-action@master
with:
Expand Down
25 changes: 8 additions & 17 deletions .github/workflows/ci-dgraph-load-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,38 +40,29 @@ jobs:
go mod tidy
make regenerate
git diff --exit-code -- .
- name: Make Docker Image
run: make image-local
- name: Make Linux Build
- name: Make Linux Build and Docker Image
run: make docker-image # this internally builds dgraph binary
- name: Build Test Binary
run: |
#!/bin/bash
# go settings
export GOOS=linux
export GOARCH=amd64
# make dgraph binary
make dgraph
# build the test binary
cd t; go build .
- name: Clean Up Environment
run: |
#!/bin/bash
# clean cache
go clean -testcache
# build the test binary
cd t; go build .
# clean up docker containers before test execution
./t -r
cd t; ./t -r
- name: Run Load Tests
run: |
#!/bin/bash
# clean cache
go clean -testcache
# go env settings
export GOPATH=~/go
# move the binary
cp dgraph/dgraph ~/go/bin
# build the test binary
cd t; go build .
cp dgraph/dgraph ~/go/bin/dgraph
# run the load tests
./t --suite=load
cd t; ./t --suite=load
# clean up docker containers after test execution
./t -r
# sleep
Expand Down
23 changes: 8 additions & 15 deletions .github/workflows/ci-dgraph-tests-arm64.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,29 @@ jobs:
go mod tidy
make regenerate
git diff --exit-code -- .
- name: Make Docker Image
run: make image-local
- name: Make Linux Build
- name: Make Linux Build and Docker Image
run: make docker-image # this internally builds dgraph binary
- name: Build Test Binary
run: |
#!/bin/bash
# go settings
# make dgraph binary
make dgraph
# build the test binary
cd t; go build .
- name: Clean Up Environment
run: |
#!/bin/bash
# clean cache
go clean -testcache
# build the test binary
cd t; go build .
# clean up docker containers before test execution
./t -r
cd t; ./t -r
- name: Run Unit Tests
run: |
#!/bin/bash
# clean cache
go clean -testcache
# go env settings
export GOPATH=~/go
# move the binary
cp dgraph/dgraph ~/go/bin
# build the test binary
cd t; go build .
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the go build . is needed right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We are calling it in the previous step (around line 50)

Copy link
Contributor

@adityasadalage adityasadalage Nov 16, 2022 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

^+1

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

replicate to all yaml?

cp dgraph/dgraph ~/go/bin/dgraph
# run the tests
./t --skip systest/export, graphql
cd t; ./t --skip="systest/export,systest/backup/minio,systest/backup/minio-large,graphql/e2e/normal,graphql/e2e/directives,graphql/e2e/custom_logic"
# clean up docker containers after test execution
./t -r
# sleep
Expand Down
23 changes: 8 additions & 15 deletions .github/workflows/ci-dgraph-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,36 +40,29 @@ jobs:
go mod tidy
make regenerate
git diff --exit-code -- .
- name: Make Docker Image
run: make image-local
- name: Make Linux Build
- name: Make Linux Build and Docker Image
run: make docker-image # this internally builds dgraph binary
- name: Build Test Binary
run: |
#!/bin/bash
# go settings
# make dgraph binary
make dgraph
# build the test binary
cd t; go build .
- name: Clean Up Environment
run: |
#!/bin/bash
# clean cache
go clean -testcache
# build the test binary
cd t; go build .
# clean up docker containers before test execution
./t -r
cd t; ./t -r
- name: Run Unit Tests
run: |
#!/bin/bash
# clean cache
go clean -testcache
# go env settings
export GOPATH=~/go
# move the binary
cp dgraph/dgraph ~/go/bin
# build the test binary
cd t; go build .
cp dgraph/dgraph ~/go/bin/dgraph
# run the tests
./t --coverage=true
cd t; ./t --coverage=true
# clean up docker containers after test execution
./t -r
# sleep
Expand Down