diff --git a/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-provisioner-sidecar.yaml b/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-provisioner-sidecar.yaml deleted file mode 100644 index 9d6ba69d0245..000000000000 --- a/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-provisioner-sidecar.yaml +++ /dev/null @@ -1,59 +0,0 @@ -presubmits: - kubernetes-sigs/container-object-storage-interface-provisioner-sidecar: - - - name: pull-container-object-storage-interface-provisioner-sidecar-build - cluster: eks-prow-build-cluster - always_run: true - decorate: true - path_alias: sigs.k8s.io/container-object-storage-interface-provisioner-sidecar - annotations: - testgrid-dashboards: sig-storage-container-object-storage-interface-provisioner-sidecar - testgrid-tab-name: build - description: Build test in container-object-storage-interface-provisioner-sidecar repo. - labels: - # running a docker-based build requires docker-in-docker (DinD) - preset-dind-enabled: "true" # see config/prow/config.yaml - 'presets' section - spec: - containers: - # specified tags are periodically updated in bulk for all prow jobs - - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master - command: - - runner.sh - args: - - bash - - -c - - | - make build - securityContext: - privileged: true # docker-in-docker needs privileged mode - resources: - limits: - cpu: 2 - memory: 4Gi - requests: - cpu: 2 - memory: 4Gi - - - name: pull-container-object-storage-interface-provisioner-sidecar-unit - cluster: eks-prow-build-cluster - always_run: true - decorate: true - path_alias: sigs.k8s.io/container-object-storage-interface-provisioner-sidecar - annotations: - testgrid-dashboards: sig-storage-container-object-storage-interface-provisioner-sidecar - testgrid-tab-name: unit - description: Unit tests in container-object-storage-interface-provisioner-sidecar repo. - spec: - containers: - - image: public.ecr.aws/docker/library/golang:latest - command: - - make - args: - - test - resources: - limits: - cpu: 2 - memory: 4Gi - requests: - cpu: 2 - memory: 4Gi diff --git a/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-api.yaml b/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface.yaml similarity index 76% rename from config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-api.yaml rename to config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface.yaml index 3b7131f2b59e..bed808d563ab 100644 --- a/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-api.yaml +++ b/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface.yaml @@ -1,14 +1,14 @@ presubmits: - kubernetes-sigs/container-object-storage-interface-api: - - name: pull-container-object-storage-interface-api-build + kubernetes-sigs/container-object-storage-interface: + - name: pull-container-object-storage-interface-build cluster: eks-prow-build-cluster always_run: true decorate: true - path_alias: sigs.k8s.io/container-object-storage-interface-api + path_alias: sigs.k8s.io/container-object-storage-interface annotations: - testgrid-dashboards: sig-storage-container-object-storage-interface-api + testgrid-dashboards: sig-storage-container-object-storage-interface testgrid-tab-name: build - description: Build test in container-object-storage-interface-api repo. + description: Build test in container-object-storage-interface repo. spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master @@ -24,15 +24,15 @@ presubmits: cpu: 2 memory: 4Gi - - name: pull-container-object-storage-interface-api-unit + - name: pull-container-object-storage-interface-unit cluster: eks-prow-build-cluster always_run: true decorate: true - path_alias: sigs.k8s.io/container-object-storage-interface-api + path_alias: sigs.k8s.io/container-object-storage-interface annotations: - testgrid-dashboards: sig-storage-container-object-storage-interface-api + testgrid-dashboards: sig-storage-container-object-storage-interface testgrid-tab-name: unit - description: Unit tests in container-object-storage-interface-api repo. + description: Unit tests in container-object-storage-interface repo. spec: containers: - image: gcr.io/k8s-staging-test-infra/kubekins-e2e:v20241218-d4b51bc3e8-master diff --git a/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-controller.yaml b/config/jobs/kubernetes-sigs/container-object-storage-interface/cosi-driver-sample.yaml similarity index 64% rename from config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-controller.yaml rename to config/jobs/kubernetes-sigs/container-object-storage-interface/cosi-driver-sample.yaml index 83230e5f41e2..c4ed73f264e9 100644 --- a/config/jobs/kubernetes-sigs/container-object-storage-interface/container-object-storage-interface-controller.yaml +++ b/config/jobs/kubernetes-sigs/container-object-storage-interface/cosi-driver-sample.yaml @@ -1,15 +1,15 @@ presubmits: - kubernetes-sigs/container-object-storage-interface-controller: + kubernetes-sigs/cosi-driver-sample: - - name: pull-container-object-storage-interface-controller-build + - name: pull-cosi-driver-sample-build cluster: eks-prow-build-cluster always_run: true decorate: true - path_alias: sigs.k8s.io/container-object-storage-interface-controller + path_alias: sigs.k8s.io/cosi-driver-sample annotations: - testgrid-dashboards: sig-storage-container-object-storage-interface-controller + testgrid-dashboards: sig-storage-cosi-driver-sample testgrid-tab-name: build - description: Build test in container-object-storage-interface-controller repo. + description: Build test in cosi-driver-sample repo. labels: # running a docker-based build requires docker-in-docker (DinD) preset-dind-enabled: "true" # see config/prow/config.yaml - 'presets' section @@ -34,15 +34,15 @@ presubmits: cpu: 2 memory: 4Gi - - name: pull-container-object-storage-interface-controller-unit + - name: pull-cosi-driver-sample-unit cluster: eks-prow-build-cluster always_run: true decorate: true - path_alias: sigs.k8s.io/container-object-storage-interface-controller + path_alias: sigs.k8s.io/cosi-driver-sample annotations: - testgrid-dashboards: sig-storage-container-object-storage-interface-controller + testgrid-dashboards: sig-storage-cosi-driver-sample testgrid-tab-name: unit - description: Unit tests in container-object-storage-interface-controller repo. + description: Unit tests in cosi-driver-sample repo. spec: containers: - image: public.ecr.aws/docker/library/golang:latest diff --git a/config/testgrids/kubernetes/sig-storage/config.yaml b/config/testgrids/kubernetes/sig-storage/config.yaml index 7701e069cac0..7f0bb70699f6 100644 --- a/config/testgrids/kubernetes/sig-storage/config.yaml +++ b/config/testgrids/kubernetes/sig-storage/config.yaml @@ -92,6 +92,5 @@ dashboards: - name: sig-storage-csi-other - name: sig-storage-lib-external-provisioner - name: sig-storage-image-build -- name: sig-storage-container-object-storage-interface-api -- name: sig-storage-container-object-storage-interface-controller -- name: sig-storage-container-object-storage-interface-provisioner-sidecar +- name: sig-storage-container-object-storage-interface +- name: sig-storage-cosi-driver-sample