fix: testing tim updates for generation

Signed-off-by: vsoch <[email protected]>
flux-framework · Mar 4, 2024 · 0c81415 · 0c81415
1 parent 004ab42
commit 0c81415
Show file tree

Hide file tree

Showing 4 changed files with 94 additions and 95 deletions.
diff --git a/.github/workflows/main.yaml b/.github/workflows/main.yaml
@@ -61,23 +61,23 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        test: [["post", "", 90],
-               ["batch", "", 90],
-               ["timed", "", 90],
-               ["debug", "", 90],
-               ["volumes", "", 90],
-               ["hello-world", "", 90],
-               ["nginx-service", "", 90],
-               ["custom-config", "", 90],
-               ["minimal-service", "", 90],               
-               ["existing-volumes", "", 90],
-               ["flux-resource-list", "", 90],
-               ["nginx-sidecar-service", "", 90],
-               ["pokemon", "ghcr.io/rse-ops/pokemon:app-latest", 90],
-               ["snakemake", "ghcr.io/rse-ops/atacseq:app-latest", 90],
-               ["singularity", "ghcr.io/rse-ops/singularity:tag-mamba", 90],
-               ["lammps", "ghcr.io/converged-computing/metric-lammps:latest", 90],
-               ["disable-view", "ghcr.io/rse-ops/lammps:flux-sched-focal", 90]]
+        test: [["post", "", 100],
+               ["batch", "", 100],
+               ["timed", "", 100],
+               ["debug", "", 100],
+               ["volumes", "", 100],
+               ["hello-world", "", 100],
+               ["nginx-service", "", 100],
+               ["custom-config", "", 100],
+               ["minimal-service", "", 100],               
+               ["existing-volumes", "", 100],
+               ["flux-resource-list", "", 100],
+               ["nginx-sidecar-service", "", 100],
+               ["pokemon", "ghcr.io/rse-ops/pokemon:app-latest", 100],
+               ["snakemake", "ghcr.io/rse-ops/atacseq:app-latest", 100],
+               ["singularity", "ghcr.io/rse-ops/singularity:tag-mamba", 100],
+               ["lammps", "ghcr.io/converged-computing/metric-lammps:latest", 100],
+               ["disable-view", "ghcr.io/rse-ops/lammps:flux-sched-focal", 100]]
 
     steps:
     - name: Clone the code

diff --git a/Makefile b/Makefile
@@ -107,7 +107,8 @@ manifests: controller-gen
 .PHONY: generate
 generate: controller-gen openapi-gen
 	$(CONTROLLER_GEN) object:headerFile="hack/boilerplate.go.txt" paths="./..."
-	${OPENAPI_GEN} --logtostderr=true -i ./api/${API_VERSION}/ -o "" -O zz_generated.openapi -p ./api/${API_VERSION}/ -h ./hack/boilerplate.go.txt -r "-"
+	rm -rf ./api/${API_VERSION}/zz_generated.openapi.go
+	${OPENAPI_GEN} --logtostderr=true  --output-file zz_generated.openapi.go --output-pkg "github.com/flux-framework/flux-operator/api/${API_VERSION}" --output-dir ./api/${API_VERSION}/ --go-header-file ./hack/boilerplate.go.txt -r "-" ./api/${API_VERSION}/
 
 .PHONY: api
 api: generate api
@@ -347,7 +348,7 @@ $(CONTROLLER_GEN): $(LOCALBIN)
 .PHONY: openapi-gen
 openapi-gen: $(OPENAPI_GEN) ## Download controller-gen locally if necessary.
 $(OPENAPI_GEN): $(LOCALBIN)
-	which ${OPENAPI_GEN} > /dev/null || (git clone https://github.com/kubernetes/kube-openapi /tmp/kube-openapi && cd /tmp/kube-openapi && git checkout 582cce78233bcb0195bc9a84f80662b9502325ee && go build -o ${OPENAPI_GEN} ./cmd/openapi-gen)
+	which ${OPENAPI_GEN} > /dev/null || (git clone https://github.com/kubernetes/kube-openapi /tmp/kube-openapi && cd /tmp/kube-openapi && go build -o ${OPENAPI_GEN} ./cmd/openapi-gen)
 
 .PHONY: swagger-jar
 swagger-jar: $(SWAGGER_JAR) ## Download controller-gen locally if necessary.