From 68b42d90c9035717381dc8aaa8ecaa37c8da0347 Mon Sep 17 00:00:00 2001 From: Marco Miller Date: Tue, 10 Mar 2020 11:59:29 -0400 Subject: [PATCH] e2e-tests: Collapse the load-tests directory level Move the contents of the former load-tests directory to the root of this structure. Before this change, that directory was the only file set present in this e2e-tests root structure. This removal also paves the way for potential non-load e2e tests, such as functional feature ones. Gerrit already has unit and acceptance or (partial) integration tests for its functionality. However organizations still need to internally develop and maintain -thus duplicate- full e2e integration tests. E.g., to smoke-test new release deployment acts for either development, staging or production purposes. This change then also proposes to consider reusing this Gatling framework (DSL, protocols) for e2e feature integration tests, alongside the emerging load ones -for Gerrit. Change-Id: Idffa7f43b546d6bfdc5d7b170d8ddc6c51b095c3 --- e2e-tests/{load-tests => }/.gitignore | 0 e2e-tests/{load-tests => }/Dockerfile | 0 e2e-tests/{load-tests => }/build.sbt | 0 e2e-tests/{load-tests => }/project/Dependencies.scala | 0 e2e-tests/{load-tests => }/project/build.properties | 0 e2e-tests/{load-tests => }/project/plugins.sbt | 0 e2e-tests/{load-tests => }/src/test/resources/application.conf | 0 .../src/test/resources/data/CloneUsingBothProtocols.json | 0 .../src/test/resources/data/ReplayRecordsFromFeeder.json | 0 e2e-tests/{load-tests => }/src/test/resources/gatling.conf | 0 e2e-tests/{load-tests => }/src/test/resources/hooks/commit-msg | 0 e2e-tests/{load-tests => }/src/test/resources/logback.xml | 0 .../com/google/gerrit/scenarios/CloneUsingBothProtocols.scala | 0 .../test/scala/com/google/gerrit/scenarios/GitSimulation.scala | 0 .../com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala | 0 15 files changed, 0 insertions(+), 0 deletions(-) rename e2e-tests/{load-tests => }/.gitignore (100%) rename e2e-tests/{load-tests => }/Dockerfile (100%) rename e2e-tests/{load-tests => }/build.sbt (100%) rename e2e-tests/{load-tests => }/project/Dependencies.scala (100%) rename e2e-tests/{load-tests => }/project/build.properties (100%) rename e2e-tests/{load-tests => }/project/plugins.sbt (100%) rename e2e-tests/{load-tests => }/src/test/resources/application.conf (100%) rename e2e-tests/{load-tests => }/src/test/resources/data/CloneUsingBothProtocols.json (100%) rename e2e-tests/{load-tests => }/src/test/resources/data/ReplayRecordsFromFeeder.json (100%) rename e2e-tests/{load-tests => }/src/test/resources/gatling.conf (100%) rename e2e-tests/{load-tests => }/src/test/resources/hooks/commit-msg (100%) rename e2e-tests/{load-tests => }/src/test/resources/logback.xml (100%) rename e2e-tests/{load-tests => }/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala (100%) rename e2e-tests/{load-tests => }/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala (100%) rename e2e-tests/{load-tests => }/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala (100%) diff --git a/e2e-tests/load-tests/.gitignore b/e2e-tests/.gitignore similarity index 100% rename from e2e-tests/load-tests/.gitignore rename to e2e-tests/.gitignore diff --git a/e2e-tests/load-tests/Dockerfile b/e2e-tests/Dockerfile similarity index 100% rename from e2e-tests/load-tests/Dockerfile rename to e2e-tests/Dockerfile diff --git a/e2e-tests/load-tests/build.sbt b/e2e-tests/build.sbt similarity index 100% rename from e2e-tests/load-tests/build.sbt rename to e2e-tests/build.sbt diff --git a/e2e-tests/load-tests/project/Dependencies.scala b/e2e-tests/project/Dependencies.scala similarity index 100% rename from e2e-tests/load-tests/project/Dependencies.scala rename to e2e-tests/project/Dependencies.scala diff --git a/e2e-tests/load-tests/project/build.properties b/e2e-tests/project/build.properties similarity index 100% rename from e2e-tests/load-tests/project/build.properties rename to e2e-tests/project/build.properties diff --git a/e2e-tests/load-tests/project/plugins.sbt b/e2e-tests/project/plugins.sbt similarity index 100% rename from e2e-tests/load-tests/project/plugins.sbt rename to e2e-tests/project/plugins.sbt diff --git a/e2e-tests/load-tests/src/test/resources/application.conf b/e2e-tests/src/test/resources/application.conf similarity index 100% rename from e2e-tests/load-tests/src/test/resources/application.conf rename to e2e-tests/src/test/resources/application.conf diff --git a/e2e-tests/load-tests/src/test/resources/data/CloneUsingBothProtocols.json b/e2e-tests/src/test/resources/data/CloneUsingBothProtocols.json similarity index 100% rename from e2e-tests/load-tests/src/test/resources/data/CloneUsingBothProtocols.json rename to e2e-tests/src/test/resources/data/CloneUsingBothProtocols.json diff --git a/e2e-tests/load-tests/src/test/resources/data/ReplayRecordsFromFeeder.json b/e2e-tests/src/test/resources/data/ReplayRecordsFromFeeder.json similarity index 100% rename from e2e-tests/load-tests/src/test/resources/data/ReplayRecordsFromFeeder.json rename to e2e-tests/src/test/resources/data/ReplayRecordsFromFeeder.json diff --git a/e2e-tests/load-tests/src/test/resources/gatling.conf b/e2e-tests/src/test/resources/gatling.conf similarity index 100% rename from e2e-tests/load-tests/src/test/resources/gatling.conf rename to e2e-tests/src/test/resources/gatling.conf diff --git a/e2e-tests/load-tests/src/test/resources/hooks/commit-msg b/e2e-tests/src/test/resources/hooks/commit-msg similarity index 100% rename from e2e-tests/load-tests/src/test/resources/hooks/commit-msg rename to e2e-tests/src/test/resources/hooks/commit-msg diff --git a/e2e-tests/load-tests/src/test/resources/logback.xml b/e2e-tests/src/test/resources/logback.xml similarity index 100% rename from e2e-tests/load-tests/src/test/resources/logback.xml rename to e2e-tests/src/test/resources/logback.xml diff --git a/e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala similarity index 100% rename from e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala rename to e2e-tests/src/test/scala/com/google/gerrit/scenarios/CloneUsingBothProtocols.scala diff --git a/e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala similarity index 100% rename from e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala rename to e2e-tests/src/test/scala/com/google/gerrit/scenarios/GitSimulation.scala diff --git a/e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala b/e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala similarity index 100% rename from e2e-tests/load-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala rename to e2e-tests/src/test/scala/com/google/gerrit/scenarios/ReplayRecordsFromFeeder.scala