Added ccm- in front of the aws ccm OTE project folder for clarity.

Author: vr4manta

Makefile

@@ -51,7 +51,7 @@ azure-config-credentials-injector:
 	go build -o bin/azure-config-credentials-injector cmd/azure-config-credentials-injector/main.go
 
 cloud-controller-manager-aws-tests-ext:
-	cd openshift-tests/aws-tests && \
+	cd openshift-tests/ccm-aws-tests && \
 	mkdir -p ../bin && \
 	go build $(GOGCFLAGS) -o "../bin/cloud-controller-manager-aws-tests-ext" \
 	      -trimpath -ldflags "$(LD_FLAGS)" .

go.work

@@ -2,6 +2,6 @@ go 1.25.0
 
 use (
 	.
-	./openshift-tests/aws-tests
+	./openshift-tests/ccm-aws-tests
 	./openshift-tests/operator-tests
 )

openshift-tests/README.md

@@ -6,7 +6,7 @@ This directory contains OpenShift Tests Extension (OTE) binaries for testing the
 
 The test suite is organized into separate sub-projects, each with independent dependencies:
 
-- **`aws-tests/`** - AWS-specific cloud controller manager tests
+- **`ccm-aws-tests/`** - AWS-specific cloud controller manager tests
   - `e2e/aws/` - AWS-specific test implementations
   - `e2e/common/` - Common helper functions (feature gate checks)
   - `main.go` - Binary entry point
@@ -60,7 +60,7 @@ The test suite is organized into separate sub-projects, each with independent de
 
 ## Test Organization
 
-### AWS Tests (`aws-tests/e2e/`)
+### AWS Tests (`ccm-aws-tests/e2e/`)
 
 - `aws/helper.go` - AWS helper functions (feature gate checks, AWS clients)
 - `aws/loadbalancer.go` - AWS NLB and load balancer tests
@@ -85,14 +85,14 @@ The test suite is organized into separate sub-projects, each with independent de
 ### Adding New Tests
 
 1. Add test files to the appropriate sub-project's `e2e/` directory:
-   - `aws-tests/e2e/aws/` - AWS-specific tests
-   - `aws-tests/e2e/common/` - AWS-specific shared helpers
+   - `ccm-aws-tests/e2e/aws/` - AWS-specific tests
+   - `ccm-aws-tests/e2e/common/` - AWS-specific shared helpers
    - `operator-tests/e2e/operator/` - Operator tests
    - `operator-tests/e2e/common/` - Operator-specific shared helpers
 
 2. Import the test package in the binary's `main.go` (blank import for side effects):
    ```go
-   import _ "github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/aws-tests/e2e/aws"
+   import _ "github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/ccm-aws-tests/e2e/aws"
    ```
 
 3. Tests are automatically discovered by the OTE framework via Ginkgo suite scanning
@@ -109,7 +109,7 @@ make cloud-controller-manager-aws-tests-ext cluster-cloud-controller-manager-ope
 make build
 
 # Or build individually from within each sub-project
-cd openshift-tests/aws-tests && go build -o ../bin/cloud-controller-manager-aws-tests-ext .
+cd openshift-tests/ccm-aws-tests && go build -o ../bin/cloud-controller-manager-aws-tests-ext .
 cd openshift-tests/operator-tests && go build -o ../bin/cluster-cloud-controller-manager-operator-tests-ext .
 ```
 
@@ -150,19 +150,19 @@ Each sub-project has its own `go.mod` file, allowing independent dependency mana
 ./hack/go-mod.sh
 
 # Or update a specific sub-project independently
-cd openshift-tests/aws-tests && go mod tidy
+cd openshift-tests/ccm-aws-tests && go mod tidy
 cd openshift-tests/operator-tests && go mod tidy
 ```
 
 The `hack/go-mod.sh` script (run from project root):
-- Tidies all modules in the workspace (root, aws-tests, operator-tests)
+- Tidies all modules in the workspace (root, ccm-aws-tests, operator-tests)
 - Syncs workspace dependencies via `go work sync`
 - Re-tidies after sync to apply version bumps
 - Verifies all modules
 - Creates unified vendor directory
 
 **Benefits of separate modules:**
-- AWS SDK updates only affect `aws-tests/` - operator tests remain stable
+- AWS SDK updates only affect `ccm-aws-tests/` - operator tests remain stable
 - Each binary can update dependencies independently without blocking the other
 - Faster, more focused dependency updates
 - Reduced dependency bloat (operator tests don't pull in AWS SDK)
@@ -173,7 +173,7 @@ The `hack/go-mod.sh` script (run from project root):
 
 This directory contains multiple Go modules organized as a workspace:
 - Root module: `github.com/openshift/cluster-cloud-controller-manager-operator`
-- AWS tests: `github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/aws-tests`
+- AWS tests: `github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/ccm-aws-tests`
 - Operator tests: `github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/operator-tests`
 
 All modules are coordinated via the workspace defined in `../go.work`.

…nshift-tests/aws-tests/e2e/aws/helper.go …ft-tests/ccm-aws-tests/e2e/aws/helper.goopenshift-tests/aws-tests/e2e/aws/helper.go renamed to openshift-tests/ccm-aws-tests/e2e/aws/helper.go openshift-tests/aws-tests/e2e/aws/helper.go renamed to openshift-tests/ccm-aws-tests/e2e/aws/helper.go

@@ -11,7 +11,7 @@ import (
 	ec2types "github.com/aws/aws-sdk-go-v2/service/ec2/types"
 	elbv2 "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2"
 	elbv2types "github.com/aws/aws-sdk-go-v2/service/elasticloadbalancingv2/types"
-	"github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/aws-tests/e2e/common"
+	"github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/ccm-aws-tests/e2e/common"
 	"k8s.io/kubernetes/test/e2e/framework"
 )
 

…-tests/aws-tests/e2e/aws/loadbalancer.go …ts/ccm-aws-tests/e2e/aws/loadbalancer.goopenshift-tests/aws-tests/e2e/aws/loadbalancer.go renamed to openshift-tests/ccm-aws-tests/e2e/aws/loadbalancer.go openshift-tests/aws-tests/e2e/aws/loadbalancer.go renamed to openshift-tests/ccm-aws-tests/e2e/aws/loadbalancer.go

@@ -1,4 +1,4 @@
-module github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/aws-tests
+module github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/ccm-aws-tests
 
 go 1.25.0
 

…ift-tests/aws-tests/e2e/common/helper.go …tests/ccm-aws-tests/e2e/common/helper.goopenshift-tests/aws-tests/e2e/common/helper.go renamed to openshift-tests/ccm-aws-tests/e2e/common/helper.go openshift-tests/aws-tests/e2e/common/helper.go renamed to openshift-tests/ccm-aws-tests/e2e/common/helper.go

@@ -20,8 +20,8 @@ import (
 	log "github.com/sirupsen/logrus"
 
 	// Importing ginkgo tests from the CCM e2e packages
-	_ "github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/aws-tests/e2e/aws"
-	_ "github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/aws-tests/e2e/common"
+	_ "github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/ccm-aws-tests/e2e/aws"
+	_ "github.com/openshift/cluster-cloud-controller-manager-operator/openshift-tests/ccm-aws-tests/e2e/common"
 	_ "k8s.io/cloud-provider-aws/tests/e2e"
 )