Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
37 changes: 37 additions & 0 deletions .github/workflows/check_make_parser.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
name: check_make_parser
on: [push, pull_request]
jobs:

build:
name: Build
runs-on: ubuntu-latest
steps:

- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13

- name: Check out code
uses: actions/checkout@v1

- name: Get dependencies
run: |
sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
sudo service mysql stop
sudo service etcd stop
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
go mod download

- name: Run bootstrap.sh
run: |
echo "Copying new bootstrap over location of legacy one."
cp .github/bootstrap.sh .
./bootstrap.sh

- name: check_make_parser
run: |
export PATH=$PWD/bin:$PATH
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD tools/check_make_parser.sh

41 changes: 41 additions & 0 deletions .github/workflows/cluster_endtoend.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: cluster_endtoend
on: [push, pull_request]
jobs:

build:
name: Build
runs-on: ubuntu-latest
steps:

- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13

- name: Check out code
uses: actions/checkout@v1

- name: Get dependencies
run: |
sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
sudo service mysql stop
sudo service etcd stop
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
go mod download

- name: Run bootstrap.sh
run: |
echo "Copying new bootstrap over location of legacy one."
cp .github/bootstrap.sh .
./bootstrap.sh

- name: Build
run: |
GOBIN=$PWD/bin make build

- name: cluster_endtoend
run: |
export PATH=$PWD/bin:$PATH
source ./dev.env
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD make e2e_test_cluster
41 changes: 41 additions & 0 deletions .github/workflows/e2e_race.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: e2e_race
on: [push, pull_request]
jobs:

build:
name: Build
runs-on: ubuntu-latest
steps:

- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13

- name: Check out code
uses: actions/checkout@v1

- name: Get dependencies
run: |
sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
sudo service mysql stop
sudo service etcd stop
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
go mod download

- name: Run bootstrap.sh
run: |
echo "Copying new bootstrap over location of legacy one."
cp .github/bootstrap.sh .
./bootstrap.sh

- name: Build
run: |
GOBIN=$PWD/bin make build

- name: e2e_race
run: |
export PATH=$PWD/bin:$PATH
source ./dev.env
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD make e2e_test_race
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: e2e Test Cluster
name: endtoend
on: [push, pull_request]
jobs:

Expand Down Expand Up @@ -34,8 +34,9 @@ jobs:
run: |
GOBIN=$PWD/bin make build

- name: Run e2e test cluster
- name: endtoend
run: |
export PATH=$PWD/bin:$PATH
source ./dev.env
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD tools/e2e_test_cluster.sh
mkdir -p /tmp/vtdataroot
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD tools/e2e_test_runner.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
name: Local Example
name: local_example
on: [push, pull_request]
jobs:

Expand Down Expand Up @@ -34,7 +34,7 @@ jobs:
run: |
GOBIN=$PWD/bin make build

- name: Run Local Example
- name: local_example
run: |
export PATH=$PWD/bin:$PATH
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD test/local_example.sh
Expand Down
40 changes: 40 additions & 0 deletions .github/workflows/unit.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
name: unit
on: [push, pull_request]
jobs:

build:
name: Build
runs-on: ubuntu-latest
steps:

- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.12

- name: Check out code
uses: actions/checkout@v1

- name: Get dependencies
run: |
sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget ant openjdk-8-jdk
sudo service mysql stop
sudo service etcd stop
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
go mod download

- name: Run bootstrap.sh
run: |
VTTOP=$PWD VTROOT=$PWD BUILD_PYTHON=0 ./bootstrap.sh

- name: Build
run: |
GOBIN=$PWD/bin make build

- name: unit
run: |
export PATH=$PWD/bin:$PATH
source ./dev.env
mkdir -p /tmp/vtdataroot
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD tools/unit_test_runner.sh
41 changes: 41 additions & 0 deletions .github/workflows/unit_race.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
name: unit_race
on: [push, pull_request]
jobs:

build:
name: Build
runs-on: ubuntu-latest
steps:

- name: Set up Go
uses: actions/setup-go@v1
with:
go-version: 1.13

- name: Check out code
uses: actions/checkout@v1

- name: Get dependencies
run: |
sudo apt-get install -y mysql-server mysql-client make unzip g++ etcd curl git wget
sudo service mysql stop
sudo service etcd stop
sudo ln -s /etc/apparmor.d/usr.sbin.mysqld /etc/apparmor.d/disable/
sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
go mod download

- name: Run bootstrap.sh
run: |
echo "Copying new bootstrap over location of legacy one."
cp .github/bootstrap.sh .
./bootstrap.sh

- name: Build
run: |
GOBIN=$PWD/bin make build

- name: unit_race
run: |
export PATH=$PWD/bin:$PATH
source ./dev.env
VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD make unit_test_race
7 changes: 1 addition & 6 deletions go/vt/mysqlctl/mycnf_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ import (
"testing"

"vitess.io/vitess/go/vt/dbconfigs"
"vitess.io/vitess/go/vt/env"
"vitess.io/vitess/go/vt/servenv"
)

Expand All @@ -37,12 +36,8 @@ func TestMycnf(t *testing.T) {
// Assigning ServerID to be different from tablet UID to make sure that there are no
// assumptions in the code that those IDs are the same.
cnf.ServerID = 22222
root, err := env.VtRoot()
if err != nil {
t.Errorf("err: %v", err)
}
cnfTemplatePaths := []string{
path.Join(root, "src/vitess.io/vitess/config/mycnf/default.cnf"),
path.Join(os.Getenv("VTTOP"), "/config/mycnf/default.cnf"),
}
data, err := cnf.makeMycnf(cnfTemplatePaths)
if err != nil {
Expand Down
12 changes: 6 additions & 6 deletions test/config.json
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,7 @@
"tools/check_make_parser.sh"
],
"Manual": false,
"Shard": 4,
"Shard": 5,
"RetryMax": 1,
"Tags": []
},
Expand Down Expand Up @@ -212,7 +212,7 @@
"test/local_example.sh"
],
"Manual": false,
"Shard": 3,
"Shard": 5,
"RetryMax": 0,
"Tags": []
},
Expand Down Expand Up @@ -418,7 +418,7 @@
"tools/e2e_test_runner.sh"
],
"Manual": false,
"Shard": 3,
"Shard": 5,
"RetryMax": 0,
"Tags": []
},
Expand All @@ -442,7 +442,7 @@
"e2e_test_race"
],
"Manual": false,
"Shard": 1,
"Shard": 5,
"RetryMax": 0,
"Tags": []
},
Expand All @@ -453,7 +453,7 @@
"tools/unit_test_runner.sh"
],
"Manual": false,
"Shard": 0,
"Shard": 5,
"RetryMax": 0,
"Tags": []
},
Expand All @@ -465,7 +465,7 @@
"unit_test_race"
],
"Manual": false,
"Shard": 3,
"Shard": 5,
"RetryMax": 0,
"Tags": []
},
Expand Down