Merge pull request #1445 from dolthub/db/root-refactor

[no-release-notes] Db/root refactor

.dockerignore

@@ -1,5 +1,5 @@
 Jenkinsfile
-bats/
+integration-tests/bats/
 proto/
 samples/
 benchmark/

.github/workflows/ci-bats-tests.yaml

@@ -98,7 +98,7 @@ jobs:
         if: matrix.os == 'windows-2019'
         run: |
           bats --tap .
-        working-directory: ./bats
+        working-directory: ./integration-tests/bats
         env:
           IS_WINDOWS: true
           WINDOWS_BASE_DIR: "/d/a"
@@ -106,4 +106,4 @@ jobs:
         if: matrix.os != 'windows-2019'
         run: |
           bats --tap .
-        working-directory: ./bats
+        working-directory: ./integration-tests/bats

.gitmodules

@@ -10,6 +10,6 @@
 [submodule "proto/third_party/grpc-go"]
 	path = proto/third_party/grpc-go
 	url = https://github.com/grpc/grpc-go.git
-[submodule "mysql-client-tests/cpp/third_party/mysql-connector-cpp"]
-	path = mysql-client-tests/cpp/third_party/mysql-connector-cpp
-	url = https://github.com/mysql/mysql-connector-cpp.git
+[submodule "integration-tests/mysql-client-tests/cpp/third_party/mysql-connector-cpp"]
+	path = integration-tests/mysql-client-tests/cpp/third_party/mysql-connector-cpp
+	url = https://github.com/mysql/mysql-connector-cpp

MySQLDockerfile

@@ -71,8 +71,8 @@ RUN curl -L -o /mysql-client-tests/java/mysql-connector-java-8.0.21.jar \
   https://repo1.maven.org/maven2/mysql/mysql-connector-java/8.0.21/mysql-connector-java-8.0.21.jar
 
 # install node deps
-COPY ./mysql-client-tests/node/package.json /mysql-client-tests/node/
-COPY ./mysql-client-tests/node/package-lock.json /mysql-client-tests/node/
+COPY ./integration-tests/mysql-client-tests/node/package.json /mysql-client-tests/node/
+COPY ./integration-tests/mysql-client-tests/node/package-lock.json /mysql-client-tests/node/
 WORKDIR /mysql-client-tests/node
 RUN npm install
 
@@ -80,8 +80,8 @@ RUN npm install
 RUN cpanm DBD::mysql
 
 # install ruby dependencies
-COPY ./mysql-client-tests/ruby/Gemfile /mysql-client-tests/ruby/
-COPY ./mysql-client-tests/ruby/Gemfile.lock /mysql-client-tests/ruby/
+COPY ./integration-tests/mysql-client-tests/ruby/Gemfile /mysql-client-tests/ruby/
+COPY ./integration-tests/mysql-client-tests/ruby/Gemfile.lock /mysql-client-tests/ruby/
 WORKDIR /mysql-client-tests/ruby
 RUN gem install bundler -v 2.1.4
 RUN bundle install
@@ -92,8 +92,8 @@ COPY ./go/ .
 ENV GOFLAGS="-mod=readonly"
 RUN go build -o /usr/local/bin/dolt ./cmd/dolt
 
-COPY ./mysql-client-tests /mysql-client-tests
-COPY ./mysql-client-tests-entrypoint.sh /mysql-client-tests/entrypoint.sh
+COPY ./integration-tests/mysql-client-tests /mysql-client-tests
+COPY ./integration-tests/mysql-client-tests/mysql-client-tests-entrypoint.sh /mysql-client-tests/entrypoint.sh
 
 WORKDIR /mysql-client-tests
 ENTRYPOINT ["/mysql-client-tests/entrypoint.sh"]

MySQLDockerfile.dockerignore

@@ -1,4 +1,4 @@
-mysql-client-tests/c/mysql-client-tests
-mysql-client-tests/java/MySQLConnectorTest.class
-mysql-client-tests/cpp/_build/**/*
-mysql-client-tests/cpp/_build
+integration-tests/mysql-client-tests/c/mysql-client-tests
+integration-tests/mysql-client-tests/java/MySQLConnectorTest.class
+integration-tests/mysql-client-tests/cpp/_build/**/*
+integration-tests/mysql-client-tests/cpp/_build