Update

redhat-developer · Jun 1, 2024 · f31ccec · f31ccec
1 parent 3d9d30d
commit f31ccec
Show file tree

Hide file tree

Showing 3 changed files with 56 additions and 29 deletions.
diff --git a/controllers/argocd_metrics_controller_test.go b/controllers/argocd_metrics_controller_test.go
@@ -30,7 +30,6 @@ import (
 	corev1 "k8s.io/api/core/v1"
 	rbacv1 "k8s.io/api/rbac/v1"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -54,12 +53,12 @@ const (
 
 func newClient(s *runtime.Scheme, namespace, name string, disableMetrics *bool) client.Client {
 	ns := corev1.Namespace{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name: namespace,
 		},
 	}
 	argocd := argoapp.ArgoCD{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      name,
 			Namespace: namespace,
 		},
@@ -342,7 +341,7 @@ func TestReconciler_add_dashboard(t *testing.T) {
 
 	// Need to create openshift-config-managed namespace for dashboards
 	ns := corev1.Namespace{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name: dashboardNamespace,
 		},
 	}

diff --git a/controllers/gitopsservice_controller_test.go b/controllers/gitopsservice_controller_test.go
@@ -38,7 +38,6 @@ import (
 	"k8s.io/apimachinery/pkg/api/errors"
 	resourcev1 "k8s.io/apimachinery/pkg/api/resource"
 	metav1 "k8s.io/apimachinery/pkg/apis/meta/v1"
-	v1 "k8s.io/apimachinery/pkg/apis/meta/v1"
 	"k8s.io/apimachinery/pkg/runtime"
 	"k8s.io/apimachinery/pkg/types"
 	"k8s.io/client-go/kubernetes/scheme"
@@ -499,7 +498,7 @@ func TestReconcile_testArgoCDForOperatorUpgrade(t *testing.T) {
 
 	// Create a basic ArgoCD CR. ArgoCD created by Operator version >= v1.6.0
 	existingArgoCD := &argoapp.ArgoCD{
-		ObjectMeta: v1.ObjectMeta{
+		ObjectMeta: metav1.ObjectMeta{
 			Name:      serviceNamespace,
 			Namespace: serviceNamespace,
 		},

diff --git a/scripts/run-kuttl-tests.sh b/scripts/run-kuttl-tests.sh
@@ -109,27 +109,56 @@ trap cleanup EXIT
 # Handle ctrl+c
 trap unexpectedError INT
 
-mkdir -p $WORK_DIR/results || exit 1
-mkdir -p $DIR/results || exit 1
-
-case "$testsuite" in
-"parallel")
-    header "Running $testsuite tests"
-	run_parallel $2
-	;;
-"sequential")
-    header "Running $testsuite tests"
-	run_sequential $2
-	;;
-"all")
-    header "Running $testsuite tests"
-	run_parallel
-	run_sequential
-	;;
-*)
-	echo "USAGE: $0 (parallel|sequential|all)" >&2
-	exit 1
-esac
 
-(( failed )) && fail_test "$testsuite tests failed"
-success $testsuite
+
+ROLLOUTS_TMP_DIR=$(mktemp -d)
+
+cd $ROLLOUTS_TMP_DIR
+
+# kubectl get namespaces
+
+# kubectl get pods -A || true
+
+# kubectl api-resources
+
+git clone https://github.com/argoproj-labs/argo-rollouts-manager
+
+#git clone https://github.com/jgwest/argo-rollouts-manager
+
+cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager"
+
+TARGET_ROLLOUT_MANAGER_COMMIT=b3e573f0e6ea3a5ec3eeba70ebb5d90e58efcd68
+
+git checkout $TARGET_ROLLOUT_MANAGER_COMMIT
+make test-e2e
+
+
+cd "$ROLLOUTS_TMP_DIR/argo-rollouts-manager"
+
+SKIP_RUN_STEP=true hack/run-upstream-argo-rollouts-e2e-tests.sh
+
+
+# mkdir -p $WORK_DIR/results || exit 1
+# mkdir -p $DIR/results || exit 1
+
+# case "$testsuite" in
+# "parallel")
+#     header "Running $testsuite tests"
+# 	run_parallel $2
+# 	;;
+# "sequential")
+#     header "Running $testsuite tests"
+# 	run_sequential $2
+# 	;;
+# "all")
+#     header "Running $testsuite tests"
+# 	run_parallel
+# 	run_sequential
+# 	;;
+# *)
+# 	echo "USAGE: $0 (parallel|sequential|all)" >&2
+# 	exit 1
+# esac
+
+# (( failed )) && fail_test "$testsuite tests failed"
+# success $testsuite