chore(tests): Remove old e2e tests and rename e2e2 to e2e (#504)

Signed-off-by: jannfis <[email protected]>

Author: jannfis

.github/workflows/ci.yaml

@@ -188,16 +188,16 @@ jobs:
           go mod download
       - name: Set up the test environment
         run: |
-          make setup-e2e2
+          make setup-e2e
       - name: Run the principal and agents
         run: |
           make all
-          make start-e2e2 2>&1 | sed -r "s/[[:cntrl:]]\[[0-9]{1,3}m//g" | tee /tmp/e2e-argocd-agent.log &
+          make start-e2e 2>&1 | sed -r "s/[[:cntrl:]]\[[0-9]{1,3}m//g" | tee /tmp/e2e-argocd-agent.log &
           sleep 10
       - name: Run the e2e tests
         run: |
           set -o pipefail
-          make test-e2e2 2>&1 | tee /tmp/test-e2e.log
+          make test-e2e 2>&1 | tee /tmp/test-e2e.log
           goreman run stop-all || echo "goreman trouble"
           sleep 30
       - name: Create Argo CD logs

Makefile

@@ -45,29 +45,25 @@ fmt:
 .PHONY: build
 build: argocd-agent cli
 
-.PHONY: setup-e2e2
-setup-e2e2: cli
+.PHONY: setup-e2e
+setup-e2e: cli
 	./hack/dev-env/setup-vcluster-env.sh create
 	./hack/dev-env/gen-creds.sh
 	./hack/dev-env/create-agent-config.sh
 
-.PHONY: start-e2e2
-start-e2e2: cli install-goreman
-	./hack/dev-env/start-e2e2.sh
+.PHONY: start-e2e
+start-e2e: cli install-goreman
+	./hack/dev-env/start-e2e.sh
 
-.PHONY: test-e2e2
-test-e2e2:
+.PHONY: test-e2e
+test-e2e:
 	./test/run-e2e.sh
 
 .PHONY: test
 test:
 	mkdir -p test/out
 	./hack/test.sh
 
-.PHONY: test-e2e
-test-e2e:
-	go test -race -timeout 60s github.com/argoproj-labs/argocd-agent/test/e2e
-
 .PHONY: mod-vendor
 mod-vendor:
 	go mod vendor

hack/dev-env/reverse-tunnel/README.md

@@ -20,7 +20,7 @@ To enable the configuration:
 
 ```
 # Setup environment as usual
-make setup-e2e2
+make setup-e2e
 
 # Installs Rathole Deployment/Services on vcluster, update 'managed-agent' cluster Secret to point to Rathole Deployment, and start local rathole container
 ./hack/dev-env/reverse-tunnel/setup.sh
@@ -31,14 +31,14 @@ To test the configuration:
 
 ```
 # Start E2E tests
-make start-e2e2
+make start-e2e
 ```
 
 
 
 ### Configuration
 
-Running 'setup-e2e2', followed by 'reverse-tunnel/setup.sh', enables this configuration:
+Running 'setup-e2e', followed by 'reverse-tunnel/setup.sh', enables this configuration:
 
 
 'vcluster-control-plane' vcluster (on k8s cluster):

hack/dev-env/reverse-tunnel/setup.sh

@@ -145,7 +145,7 @@ echo ""
 echo "* Starting the rathole local client."
 echo "* - This may initially report an error while waiting for LoadBalancer service ('Failed to run the control channel: (...): Name or service not known. '), but it will keep trying until connection is established."
 echo "* - You can also safely ignore this warning: 'Failed to run the data channel: Failed to read cmd: early eof'"
-echo "* - This message indicates you need to run 'make start-e2e2', or that it is not currently running: 'Failed to run the data channel: Failed to connect to 127.0.0.1:6379: Connection refused (os error 111)'"
+echo "* - This message indicates you need to run 'make start-e2e', or that it is not currently running: 'Failed to run the data channel: Failed to connect to 127.0.0.1:6379: Connection refused (os error 111)'"
 echo ""
 echo "CTRL-C / Command-C to terminate rathole tunnel."
 $TEMP_DIR/client/run.sh

hack/dev-env/start-e2e2.sh renamed to hack/dev-env/start-e2e.sh

@@ -21,19 +21,19 @@ Both the vcluster and Argo CD installations require that LoadBalancer functional
 To setup the test environment on the cluster, execute the following command from the repository root:
 
 ```shell
-make setup-e2e2
+make setup-e2e
 ```
 
 To run the principal and agents, execute the following command from the repository root:
 
 ```shell
-make start-e2e2
+make start-e2e
 ```
 
 To run the tests, execute the following command from the repository root in a separate terminal instance:
 
 ```shell
-make test-e2e2
+make test-e2e
 ```
 
 # Writing new end-to-end tests

test/e2e2/README.md renamed to test/e2e/README.md

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package e2e2
+package e2e
 
 import (
 	"testing"
 	"time"
 
-	"github.com/argoproj-labs/argocd-agent/test/e2e2/fixture"
+	"github.com/argoproj-labs/argocd-agent/test/e2e/fixture"
 	argoapp "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/stretchr/testify/suite"
 	"k8s.io/apimachinery/pkg/api/errors"

test/e2e2/appproject_test.go renamed to test/e2e/appproject_test.go

@@ -12,13 +12,13 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package e2e2
+package e2e
 
 import (
 	"testing"
 	"time"
 
-	"github.com/argoproj-labs/argocd-agent/test/e2e2/fixture"
+	"github.com/argoproj-labs/argocd-agent/test/e2e/fixture"
 	argoapp "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/stretchr/testify/suite"
 	"k8s.io/apimachinery/pkg/api/errors"

test/e2e2/basic_test.go renamed to test/e2e/basic_test.go

@@ -12,7 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package e2e2
+package e2e
 
 import (
 	"context"
@@ -21,7 +21,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/argoproj-labs/argocd-agent/test/e2e2/fixture"
+	"github.com/argoproj-labs/argocd-agent/test/e2e/fixture"
 	argoapp "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/stretchr/testify/require"
 	"github.com/stretchr/testify/suite"

test/e2e2/cache_test.go renamed to test/e2e/cache_test.go

@@ -12,15 +12,15 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-package e2e2
+package e2e
 
 import (
 	"fmt"
 	"os"
 	"testing"
 	"time"
 
-	"github.com/argoproj-labs/argocd-agent/test/e2e2/fixture"
+	"github.com/argoproj-labs/argocd-agent/test/e2e/fixture"
 	appv1 "github.com/argoproj/argo-cd/v3/pkg/apis/application/v1alpha1"
 	"github.com/stretchr/testify/suite"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"