add CNINode integration tests in canary (#426)

sushrk · web-flow · commit 63be4d413f8b · 2024-05-21T21:42:20.000-07:00
diff --git a/scripts/test/run-canary-test.sh b/scripts/test/run-canary-test.sh
@@ -115,6 +115,7 @@ function run_canary_tests() {
     echo "skipping Windows tests"
   fi
   (CGO_ENABLED=0 ginkgo --no-color --focus="CANARY" $EXTRA_GINKGO_FLAGS -v --timeout 5m $GINKGO_TEST_BUILD_DIR/webhook.test -- --cluster-kubeconfig=$KUBE_CONFIG_PATH --cluster-name=$CLUSTER_NAME --aws-region=$REGION --aws-vpc-id=$VPC_ID)
+  (CGO_ENABLED=0 ginkgo --no-color --focus="CANARY" $EXTRA_GINKGO_FLAGS -v --timeout 10m $GINKGO_TEST_BUILD_DIR/cninode.test -- --cluster-kubeconfig=$KUBE_CONFIG_PATH --cluster-name=$CLUSTER_NAME --aws-region=$REGION --aws-vpc-id=$VPC_ID)
 }
 
 echo "Starting the ginkgo test suite"
diff --git a/scripts/test/run-integration-tests.sh b/scripts/test/run-integration-tests.sh
@@ -47,6 +47,7 @@ function run_integration_tests(){
     echo "skipping Windows tests"
   fi
   (cd $INTEGRATION_TEST_DIR/webhook && CGO_ENABLED=0 ginkgo --skip=LOCAL $EXTRA_GINKGO_FLAGS -v -timeout=5m -- -cluster-kubeconfig=$KUBE_CONFIG_PATH -cluster-name=$CLUSTER_NAME --aws-region=$REGION --aws-vpc-id $VPC_ID) || TEST_RESULT=fail
+  (cd $INTEGRATION_TEST_DIR/cninode && CGO_ENABLED=0 ginkgo --skip=LOCAL $EXTRA_GINKGO_FLAGS -v -timeout=10m -- -cluster-kubeconfig=$KUBE_CONFIG_PATH -cluster-name=$CLUSTER_NAME --aws-region=$REGION --aws-vpc-id $VPC_ID) || TEST_RESULT=fail
 
   if [[ "$TEST_RESULT" == fail ]]; then
       exit 1
diff --git a/test/integration/cninode/cninode_test.go b/test/integration/cninode/cninode_test.go
@@ -30,7 +30,7 @@ import (
 	"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"
 )
 
-var _ = Describe("CNINode test", func() {
+var _ = Describe("[CANARY]CNINode test", func() {
 	Describe("CNINode count verification on adding or removing node", func() {
 		var oldMinSize int64
 		var oldMaxSize int64

Original file line number	Diff line number	Diff line change
`@@ -115,6 +115,7 @@ function run_canary_tests() {`
`115`	`115`	`echo "skipping Windows tests"`
`116`	`116`	`fi`
`117`	`117`	`(CGO_ENABLED=0 ginkgo --no-color --focus="CANARY" $EXTRA_GINKGO_FLAGS -v --timeout 5m $GINKGO_TEST_BUILD_DIR/webhook.test -- --cluster-kubeconfig=$KUBE_CONFIG_PATH --cluster-name=$CLUSTER_NAME --aws-region=$REGION --aws-vpc-id=$VPC_ID)`
	`118`	`+ (CGO_ENABLED=0 ginkgo --no-color --focus="CANARY" $EXTRA_GINKGO_FLAGS -v --timeout 10m $GINKGO_TEST_BUILD_DIR/cninode.test -- --cluster-kubeconfig=$KUBE_CONFIG_PATH --cluster-name=$CLUSTER_NAME --aws-region=$REGION --aws-vpc-id=$VPC_ID)`
`118`	`119`	`}`
`119`	`120`
`120`	`121`	`echo "Starting the ginkgo test suite"`
Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ import (`
`30`	`30`	`"sigs.k8s.io/controller-runtime/pkg/controller/controllerutil"`
`31`	`31`	`)`
`32`	`32`
`33`		`-var _ = Describe("CNINode test", func() {`
	`33`	`+var _ = Describe("[CANARY]CNINode test", func() {`
`34`	`34`	`Describe("CNINode count verification on adding or removing node", func() {`
`35`	`35`	`var oldMinSize int64`
`36`	`36`	`var oldMaxSize int64`