Fixed tests.

Author: lamai93

Makefile

@@ -369,7 +369,7 @@ redeploy-operator: delete-operator manifests
 
 $(ARANGOSYNCTESTCTRLBIN): $(GOBUILDDIR) $(SOURCES)
 	@mkdir -p $(BINDIR)
-	CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(ARANGOSYNCTESTCTRLBINNAME) $(REPOPATH)/tests/sync
+	CGO_ENABLED=0 go build -installsuffix cgo -ldflags "-X main.projectVersion=$(VERSION) -X main.projectBuild=$(COMMIT)" -o $(ARANGOSYNCTESTCTRLBIN) $(REPOPATH)/tests/sync
 
 .PHONY: check-sync-vars
 check-sync-vars:

tests/sync/main.go

@@ -139,7 +139,7 @@ func newArangoSyncTestJob(ns, name string) *batchv1.Job {
 
 func waitForSyncDeploymentReady(ctx context.Context, ns, name string, kubecli kubernetes.Interface, c versioned.Interface) error {
 	return retry.Retry(func() error {
-		deployment, err := c.Database().ArangoDeployments(ns).Get(name, metav1.GetOptions{})
+		deployment, err := c.DatabaseV1alpha().ArangoDeployments(ns).Get(name, metav1.GetOptions{})
 		if err != nil {
 			return err
 		}
@@ -167,15 +167,15 @@ func setupArangoDBCluster(ctx context.Context, kube kubernetes.Interface, c vers
 	dstSpec := newSyncDeployment(namespace, dstDeploymentName, false)
 	srcSpec := newSyncDeployment(namespace, srcDeploymentName, true)
 
-	if _, err := c.Database().ArangoDeployments(namespace).Create(srcSpec); err != nil {
+	if _, err := c.DatabaseV1alpha().ArangoDeployments(namespace).Create(srcSpec); err != nil {
 		return err
 	}
-	if _, err := c.Database().ArangoDeployments(namespace).Create(dstSpec); err != nil {
+	if _, err := c.DatabaseV1alpha().ArangoDeployments(namespace).Create(dstSpec); err != nil {
 		return err
 	}
 
 	replSpec := newReplication(namespace, replicationResourceName)
-	if _, err := c.Replication().ArangoDeploymentReplications(namespace).Create(replSpec); err != nil {
+	if _, err := c.ReplicationV1alpha().ArangoDeploymentReplications(namespace).Create(replSpec); err != nil {
 		return err
 	}
 
@@ -196,7 +196,7 @@ func setupArangoDBCluster(ctx context.Context, kube kubernetes.Interface, c vers
 
 func waitForReplicationGone(ns, name string, c versioned.Interface) error {
 	return retry.Retry(func() error {
-		if _, err := c.Replication().ArangoDeploymentReplications(ns).Get(name, metav1.GetOptions{}); k8sutil.IsNotFound(err) {
+		if _, err := c.ReplicationV1alpha().ArangoDeploymentReplications(ns).Get(name, metav1.GetOptions{}); k8sutil.IsNotFound(err) {
 			return nil
 		} else if err != nil {
 			return err
@@ -207,7 +207,7 @@ func waitForReplicationGone(ns, name string, c versioned.Interface) error {
 
 func waitForDeploymentGone(ns, name string, c versioned.Interface) error {
 	return retry.Retry(func() error {
-		if _, err := c.Database().ArangoDeployments(ns).Get(name, metav1.GetOptions{}); k8sutil.IsNotFound(err) {
+		if _, err := c.DatabaseV1alpha().ArangoDeployments(ns).Get(name, metav1.GetOptions{}); k8sutil.IsNotFound(err) {
 			return nil
 		} else if err != nil {
 			return err
@@ -217,7 +217,7 @@ func waitForDeploymentGone(ns, name string, c versioned.Interface) error {
 }
 
 func removeReplicationWaitForCompletion(ns, name string, c versioned.Interface) error {
-	if err := c.Replication().ArangoDeploymentReplications(ns).Delete(name, &metav1.DeleteOptions{}); err != nil {
+	if err := c.ReplicationV1alpha().ArangoDeploymentReplications(ns).Delete(name, &metav1.DeleteOptions{}); err != nil {
 		if k8sutil.IsNotFound(err) {
 			return nil
 		}
@@ -230,7 +230,7 @@ func removeReplicationWaitForCompletion(ns, name string, c versioned.Interface)
 }
 
 func removeDeploymentWaitForCompletion(ns, name string, c versioned.Interface) error {
-	if err := c.Database().ArangoDeployments(ns).Delete(name, &metav1.DeleteOptions{}); err != nil {
+	if err := c.DatabaseV1alpha().ArangoDeployments(ns).Delete(name, &metav1.DeleteOptions{}); err != nil {
 		if k8sutil.IsNotFound(err) {
 			return nil
 		}

tests/upgrade_test.go

@@ -86,24 +86,23 @@ func TestUpgradeActiveFailoverRocksDB33to34(t *testing.T) {
 func TestUpgradeClusterRocksDB3322Cto342C(t *testing.T) {
 	runUpgradeTest(t, &upgradeTest{
 		fromVersion: "3.3.22",
-		toVersion:   "3.4.2-1",
+		toVersion:   "3.4.6.1",
 		shortTest:   true,
 	})
 }
 
-func TestUpgradeClusterRocksDB3316Cto3322C(t *testing.T) {
+func TestUpgradeClusterRocksDB3316Cto3323C(t *testing.T) {
 	runUpgradeTest(t, &upgradeTest{
 		fromVersion: "3.3.16",
-		toVersion:   "3.3.22",
+		toVersion:   "3.3.23",
 		shortTest:   false,
 	})
 }
 
-func TestUpgradeClusterRocksDB341Cto342C(t *testing.T) {
+func TestUpgradeClusterRocksDB346Cto3461C(t *testing.T) {
 	runUpgradeTest(t, &upgradeTest{
-		fromVersion: "3.4.1",
-		toImageTag:  "3.4.2",
-		toVersion:   "3.4.2-1",
+		fromVersion: "3.4.6",
+		toVersion:   "3.4.6.1",
 		shortTest:   true,
 	})
 }
@@ -125,6 +124,9 @@ type upgradeTest struct {
 	toImage    string
 	toImageTag string
 
+	toEnterprise   bool
+	fromEnterprise bool
+
 	name      string
 	shortTest bool
 }
@@ -145,6 +147,9 @@ type UpgradeTest interface {
 
 func (u *upgradeTest) FromImage() string {
 	imageName := "arangodb/arangodb"
+	if u.fromEnterprise {
+		imageName = "arangodb/enterprise"
+	}
 	if u.fromImage != "" {
 		imageName = u.fromImage
 	}
@@ -157,6 +162,9 @@ func (u *upgradeTest) FromImage() string {
 
 func (u *upgradeTest) ToImage() string {
 	imageName := "arangodb/arangodb"
+	if u.toEnterprise {
+		imageName = "arangodb/enterprise"
+	}
 	if u.toImage != "" {
 		imageName = u.toImage
 	}