From c57d932a349a72303148b7502d13e3e910a05f60 Mon Sep 17 00:00:00 2001 From: Mateusz Szostok Date: Wed, 10 Jul 2019 15:19:13 +0200 Subject: [PATCH 1/2] Split the xbuild job for the Service Catalog images --- .../service-catalog-presubmits.yaml | 65 ++++++++++++++++--- 1 file changed, 55 insertions(+), 10 deletions(-) diff --git a/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml b/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml index 42ab8ac04a6e..3a4d1a626186 100644 --- a/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml +++ b/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml @@ -1,3 +1,12 @@ +build_image_cfg: &build_image_cfg + decorate: true + decoration_config: + timeout: 45m + always_run: true + skip_report: false + labels: + preset-dind-enabled: "true" + presubmits: kubernetes-sigs/service-catalog: - name: pull-service-catalog-unit @@ -34,14 +43,8 @@ presubmits: # docker-in-docker needs privileged mode securityContext: privileged: true - - name: pull-service-catalog-xbuild - decorate: true - decoration_config: - timeout: 90m - always_run: true - skip_report: false - labels: - preset-dind-enabled: "true" + - name: pull-service-catalog-build-image-all-arch + <<: *build_image_cfg spec: containers: - image: gcr.io/k8s-testimages/kubekins-e2e:v20190612-bf4a71f-master @@ -50,8 +53,50 @@ presubmits: - runner.sh args: - make - - images-all - - svcat-all + - service-catalog-image-all-arch # docker-in-docker needs privileged mode securityContext: privileged: true + - name: pull-brokers-build-image-all-arch + <<: *build_image_cfg + spec: + containers: + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190612-bf4a71f-master + command: + # generic runner script, handles DIND, bazelrc for caching, etc. + - runner.sh + args: + - make + - user-broker-image-all-arch + - test-broker-image-all-arch + # docker-in-docker needs privileged mode + securityContext: + privileged: true + - name: pull-healthcheck-build-image-all-arch + <<: *build_image_cfg + spec: + containers: + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190612-bf4a71f-master + command: + # generic runner script, handles DIND, bazelrc for caching, etc. + - runner.sh + args: + - make + - healthcheck-image-all-arch + # docker-in-docker needs privileged mode + securityContext: + privileged: true + - name: pull-svcat-build-image-all-arch + <<: *build_image_cfg + spec: + containers: + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190612-bf4a71f-master + command: + # generic runner script, handles DIND, bazelrc for caching, etc. + - runner.sh + args: + - make + - svcat-all + # docker-in-docker needs privileged mode + securityContext: + privileged: true From b68e391e9d232fc358e4e92a27a342d06a2d8eda Mon Sep 17 00:00:00 2001 From: Mateusz Szostok Date: Tue, 13 Aug 2019 10:29:14 +0200 Subject: [PATCH 2/2] Split the xbuild by architecture instead of domain --- .../service-catalog-presubmits.yaml | 51 +++++++++++++------ 1 file changed, 36 insertions(+), 15 deletions(-) diff --git a/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml b/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml index 3a4d1a626186..9cd2b73698a7 100644 --- a/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml +++ b/config/jobs/kubernetes-sigs/service-catalog/service-catalog-presubmits.yaml @@ -24,13 +24,7 @@ presubmits: - name: NO_DOCKER value: "1" - name: pull-service-catalog-integration - decorate: true - decoration_config: - timeout: 45m - always_run: true - skip_report: false - labels: - preset-dind-enabled: "true" + <<: *build_image_cfg spec: containers: - image: gcr.io/k8s-testimages/kubekins-e2e:v20190612-bf4a71f-master @@ -43,7 +37,7 @@ presubmits: # docker-in-docker needs privileged mode securityContext: privileged: true - - name: pull-service-catalog-build-image-all-arch + - name: pull-build-all-images-for-amd64 <<: *build_image_cfg spec: containers: @@ -53,11 +47,39 @@ presubmits: - runner.sh args: - make - - service-catalog-image-all-arch + - arch-image-amd64 # docker-in-docker needs privileged mode securityContext: privileged: true - - name: pull-brokers-build-image-all-arch + - name: pull-build-all-images-for-arm + <<: *build_image_cfg + spec: + containers: + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190612-bf4a71f-master + command: + # generic runner script, handles DIND, bazelrc for caching, etc. + - runner.sh + args: + - make + - arch-image-arm + # docker-in-docker needs privileged mode + securityContext: + privileged: true + - name: pull-build-all-images-for-arm64 + <<: *build_image_cfg + spec: + containers: + - image: gcr.io/k8s-testimages/kubekins-e2e:v20190612-bf4a71f-master + command: + # generic runner script, handles DIND, bazelrc for caching, etc. + - runner.sh + args: + - make + - arch-image-arm64 + # docker-in-docker needs privileged mode + securityContext: + privileged: true + - name: pull-build-all-images-for-ppc64le <<: *build_image_cfg spec: containers: @@ -67,12 +89,11 @@ presubmits: - runner.sh args: - make - - user-broker-image-all-arch - - test-broker-image-all-arch + - arch-image-ppc64le # docker-in-docker needs privileged mode securityContext: privileged: true - - name: pull-healthcheck-build-image-all-arch + - name: pull-build-all-images-for-s390x <<: *build_image_cfg spec: containers: @@ -82,11 +103,11 @@ presubmits: - runner.sh args: - make - - healthcheck-image-all-arch + - arch-image-ppc64le # docker-in-docker needs privileged mode securityContext: privileged: true - - name: pull-svcat-build-image-all-arch + - name: pull-build-all-images-for-svcat <<: *build_image_cfg spec: containers: