Merge pull request #5527 from planetscale/morgo-remove-vttop2

Flatten/Merge VTTOP and VTROOT variables
vitessio · Dec 10, 2019 · aeab98e · aeab98e
2 parents 6439799 + 65e2b22
commit aeab98e
Show file tree

Hide file tree

Showing 71 changed files with 278 additions and 481 deletions.
diff --git a/.github/bootstrap.sh b/.github/bootstrap.sh
diff --git a/.github/workflows/check_make_parser.yml b/.github/workflows/check_make_parser.yml
@@ -24,14 +24,11 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
-    - name: Run bootstrap.sh
+    - name: Run make minimaltools
       run: |
-        echo "Copying new bootstrap over location of legacy one."
-        cp .github/bootstrap.sh .
-        ./bootstrap.sh
+        make minimaltools
 
     - name: check_make_parser
       run: |
-        export PATH=$PWD/bin:$PATH
-        VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD tools/check_make_parser.sh
+        tools/check_make_parser.sh
 
diff --git a/.github/workflows/cluster_endtoend.yml b/.github/workflows/cluster_endtoend.yml
@@ -24,18 +24,10 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
-    - name: Run bootstrap.sh
+    - name: Run make minimaltools
       run: |
-        echo "Copying new bootstrap over location of legacy one."
-        cp .github/bootstrap.sh .
-        ./bootstrap.sh
-
-    - name: Build
-      run: |
-        VTROOT=$PWD VTTOP=$PWD make build
+        make minimaltools
 
     - name: cluster_endtoend
       run: |
-        export PATH=$PWD/bin:$PATH
-        source ./dev.env
-        VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD make e2e_test_cluster
+        make e2e_test_cluster
diff --git a/.github/workflows/e2e_race.yml b/.github/workflows/e2e_race.yml
@@ -24,18 +24,10 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
-    - name: Run bootstrap.sh
+    - name: Run make minimaltools
       run: |
-        echo "Copying new bootstrap over location of legacy one."
-        cp .github/bootstrap.sh .
-        ./bootstrap.sh
-
-    - name: Build
-      run: |
-        VTROOT=$PWD VTTOP=$PWD make build
+        make minimaltools
 
     - name: e2e_race
       run: |
-        export PATH=$PWD/bin:$PATH
-        source ./dev.env
-        VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD make e2e_test_race
+        make e2e_test_race
diff --git a/.github/workflows/endtoend.yml b/.github/workflows/endtoend.yml
@@ -24,19 +24,14 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
-    - name: Run bootstrap.sh
+    - name: Run make minimaltools
       run: |
-        echo "Copying new bootstrap over location of legacy one."
-        cp .github/bootstrap.sh .
-        ./bootstrap.sh
+        make minimaltools
 
     - name: Build
       run: |
-        VTROOT=$PWD VTTOP=$PWD make build
+        make build
 
     - name: endtoend
       run: |
-        export PATH=$PWD/bin:$PATH
-        source ./dev.env
-        mkdir -p /tmp/vtdataroot
-        VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD tools/e2e_test_runner.sh
+        tools/e2e_test_runner.sh
diff --git a/.github/workflows/local_example.yml b/.github/workflows/local_example.yml
@@ -24,18 +24,15 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
-    - name: Run bootstrap.sh
+    - name: Run make minimaltools
       run: |
-        echo "Copying new bootstrap over location of legacy one."
-        cp .github/bootstrap.sh .
-        ./bootstrap.sh
+        make minimaltools
 
     - name: Build
       run: |
-        VTROOT=$PWD VTTOP=$PWD make build
+        make build
 
     - name: local_example
       run: |
-        export PATH=$PWD/bin:$PATH
-        VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD test/local_example.sh
+        test/local_example.sh
 
diff --git a/.github/workflows/unit.yml b/.github/workflows/unit.yml
@@ -24,17 +24,10 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
-    - name: Run bootstrap.sh
+    - name: Run make tools
       run: |
-        VTTOP=$PWD VTROOT=$PWD BUILD_PYTHON=0 ./bootstrap.sh
-
-    - name: Build
-      run: |
-        VTROOT=$PWD VTTOP=$PWD make build
+        make tools
 
     - 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
+        make test
diff --git a/.github/workflows/unit_race.yml b/.github/workflows/unit_race.yml
@@ -24,16 +24,10 @@ jobs:
         sudo apparmor_parser -R /etc/apparmor.d/usr.sbin.mysqld
         go mod download
 
-    - name: Run bootstrap.sh
+    - name: Run make tools
       run: |
-        VTTOP=$PWD VTROOT=$PWD BUILD_PYTHON=0 ./bootstrap.sh
-
-    - name: Build
-      run: |
-        VTROOT=$PWD VTTOP=$PWD make build
+        make tools
 
     - name: unit_race
       run: |
-        export PATH=$PWD/bin:$PATH
-        source ./dev.env
-        VTDATAROOT=/tmp/vtdataroot VTTOP=$PWD VTROOT=$PWD make unit_test_race
+        make unit_test_race
diff --git a/.gitignore b/.gitignore
@@ -79,3 +79,10 @@ releases
 
 # Vagrant
 .vagrant
+
+dist/*
+py-vtdb*
+vthook*
+bin*
+
+vtdataroot*