diff --git a/prow/cluster/jobs/istio/envoy/istio.envoy.release-1.10.gen.yaml b/prow/cluster/jobs/istio/envoy/istio.envoy.release-1.10.gen.yaml index 77af58ad070..d4299774d63 100644 --- a/prow/cluster/jobs/istio/envoy/istio.envoy.release-1.10.gen.yaml +++ b/prow/cluster/jobs/istio/envoy/istio.envoy.release-1.10.gen.yaml @@ -1,65 +1,4 @@ # THIS FILE IS AUTOGENERATED. See prow/config/README.md -periodics: -- annotations: - testgrid-alert-email: istio-oncall@googlegroups.com - testgrid-dashboards: istio_release-1.10_envoy_periodic - testgrid-num-failures-to-alert: "1" - decorate: true - decoration_config: - timeout: 4h0m0s - extra_refs: - - base_ref: release-1.10 - org: istio - path_alias: istio.io/envoy - repo: envoy - - base_ref: master - org: istio - path_alias: istio.io/test-infra - repo: test-infra - interval: 24h - name: update-envoy_envoy_release-1.10_periodic - spec: - containers: - - command: - - ../test-infra/tools/automator/automator.sh - - --org=istio - - --repo=envoy - - '--title=Automator: merge upstream changes to $AUTOMATOR_ORG/$AUTOMATOR_REPO@$AUTOMATOR_BRANCH' - - --labels=tide/merge-method-merge - - --modifier=merge_upstream_changes - - --token-path=/etc/github-token/oauth - - --merge-repository=https://github.com/envoyproxy/envoy.git - - --merge-branch=release/v1.18 - image: gcr.io/istio-testing/build-tools:release-1.10-2021-04-06T22-07-25 - name: "" - resources: - limits: - cpu: "64" - ephemeral-storage: 1790G - memory: 240G - requests: - cpu: "48" - ephemeral-storage: 1500G - memory: 180G - securityContext: - privileged: true - volumeMounts: - - mountPath: /home/prow/go/pkg - name: build-cache - subPath: gomod - - mountPath: /etc/github-token - name: github - readOnly: true - nodeSelector: - testing: build-pool - volumes: - - hostPath: - path: /tmp/prow/cache - type: DirectoryOrCreate - name: build-cache - - name: github - secret: - secretName: oauth-token postsubmits: istio/envoy: - annotations: diff --git a/prow/config/jobs/envoy-1.10.yaml b/prow/config/jobs/envoy-1.10.yaml index 5704f612659..516fb76f5c2 100644 --- a/prow/config/jobs/envoy-1.10.yaml +++ b/prow/config/jobs/envoy-1.10.yaml @@ -54,24 +54,6 @@ jobs: image: gcr.io/istio-testing/build-tools:release-1.10-2021-04-06T22-07-25 timeout: 4h -- name: update-envoy - types: [periodic] - interval: 24h - command: - - ../test-infra/tools/automator/automator.sh - - --org=istio - - --repo=envoy - - "--title=Automator: merge upstream changes to $AUTOMATOR_ORG/$AUTOMATOR_REPO@$AUTOMATOR_BRANCH" - - --labels=tide/merge-method-merge - - --modifier=merge_upstream_changes - - --token-path=/etc/github-token/oauth - - --merge-repository=https://github.com/envoyproxy/envoy.git - - --merge-branch=release/v1.18 - requirements: [github] - repos: [istio/test-infra@master] - image: gcr.io/istio-testing/build-tools:release-1.10-2021-04-06T22-07-25 - timeout: 4h - resources: default: requests: diff --git a/testgrid/config.yaml b/testgrid/config.yaml index 2cd5d5dbd09..3f79fbdbcc4 100644 --- a/testgrid/config.yaml +++ b/testgrid/config.yaml @@ -49,7 +49,7 @@ dashboards: - name: istio_release-1.10_api_postsubmit - name: istio_release-1.10_tools_postsubmit - name: istio_release-1.10_release-builder_postsubmit -- name: istio_release-1.10_envoy_periodic +# - name: istio_release-1.10_envoy_periodic - name: istio_release-1.9_istio - name: istio_release-1.9_api - name: istio_release-1.9_client-go