Merge remote-tracking branch 'upstream/main' into rhoai-3.2

Author: m-rafeeq

.github/workflows/test-go.yaml

@@ -8,7 +8,6 @@ jobs:
   generate:
     name: Generate
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'kubeflow/trainer' }}
     env:
       GOPATH: ${{ github.workspace }}/go
     defaults:
@@ -48,7 +47,6 @@ jobs:
   test:
     name: Test
     runs-on: ubuntu-latest
-    if: ${{ github.repository == 'kubeflow/trainer' }}
     env:
       GOPATH: ${{ github.workspace }}/go
     defaults:

Makefile

@@ -164,9 +164,11 @@ vet: ## Run go vet against the code.
 	go vet ./...
 
 .PHONY: golangci-lint
-golangci-lint: golangci-lint-install golangci-lint-kal ## Run golangci-lint to verify Go files.
+# TODO(robell): re-enable golangci-lint-kal once we've pulled in upstream v2.2.
+# golangci-lint: golangci-lint-install golangci-lint-kal ## Run golangci-lint to verify Go files.
+golangci-lint: golangci-lint-install
 	golangci-lint run --timeout 5m --go 1.24 ./...
-	$(GOLANGCI_LINT_KAL) run -v --config $(PROJECT_DIR)/.golangci-kal.yml
+	#$(GOLANGCI_LINT_KAL) run -v --config $(PROJECT_DIR)/.golangci-kal.yml #
 
 # Instructions to run tests.
 .PHONY: test

pkg/rhai/README.md

@@ -14,8 +14,10 @@ The `rhai/` package provides midstream-specific features that are not part of up
 ```
 pkg/rhai/
 ├── constants/          # RHAI-specific constants and annotations
-├── progression/        # Core progression tracking logic and tests
-└── test/              # End-to-end tests
+└── progression/        # Core progression tracking logic and tests
+
+pkg/test/e2e/
+└── rhai/               # End-to-end tests for rhai functionality
 ```
 
 ## Integration
@@ -64,6 +66,14 @@ watch -n 2 'kubectl get trainjob <job-name> -n <namespace> -o jsonpath="{.metada
 
 ## Development
 
+
+Run unit tests with
+```bash
+go test ./pkg/rhai/...
+```
+
+Run e2e tests with:
 ```bash
-go test ./pkg/rhai/test/... -v -timeout 30m -ginkgo.v -ginkgo.progress
+make test-e2e-setup-cluster
+go test ./test/e2e/rhai... -v -timeout 30m -ginkgo.v -ginkgo.progress
 ```

pkg/rhai/progression/progression_test.go

@@ -278,7 +278,7 @@ func TestPollTrainingProgress(t *testing.T) {
 			// Create test server
 			server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				w.WriteHeader(tt.responseStatus)
-				w.Write([]byte(tt.responseBody))
+				_, _ = w.Write([]byte(tt.responseBody))
 			}))
 			defer server.Close()
 
@@ -1762,7 +1762,3 @@ func ptrInt(i int) *int {
 func ptrFloat64(f float64) *float64 {
 	return &f
 }
-
-func ptrString(s string) *string {
-	return &s
-}