From 2080bb1ed92c8a6d089faf066b2893971837d473 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Mon, 9 Sep 2024 21:00:47 -0700 Subject: [PATCH 1/2] etcd: use apt -o APT::Update::Error-Mode=any when updating pkg lists This was initially done in #32602, but this pull request didn't change all of the places where robustness tests called apt-get update. --- config/jobs/etcd/etcd-periodics.yaml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/config/jobs/etcd/etcd-periodics.yaml b/config/jobs/etcd/etcd-periodics.yaml index 28b87e9c250c..ff408cf4f868 100644 --- a/config/jobs/etcd/etcd-periodics.yaml +++ b/config/jobs/etcd/etcd-periodics.yaml @@ -216,7 +216,7 @@ periodics: - -c - | result=0 - apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 + apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf make install-lazyfs set -euo pipefail @@ -261,7 +261,7 @@ periodics: - -c - | result=0 - apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 + apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf make install-lazyfs set -euo pipefail @@ -306,7 +306,7 @@ periodics: - -c - | result=0 - apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 + apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf make install-lazyfs set -euo pipefail @@ -351,7 +351,7 @@ periodics: - -c - | result=0 - apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 + apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf make install-lazyfs set -euo pipefail @@ -396,7 +396,7 @@ periodics: - -c - | result=0 - apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 + apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf make install-lazyfs set -euo pipefail @@ -441,7 +441,7 @@ periodics: - -c - | result=0 - apt update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 + apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf make install-lazyfs set -euo pipefail From 59a67745cd528b1a74d077c29fc9e190c6c204f9 Mon Sep 17 00:00:00 2001 From: Ivan Valdes Date: Mon, 9 Sep 2024 21:02:38 -0700 Subject: [PATCH 2/2] etcd: remove duplicated robustness test periodic job As discussed in etcd-io/etcd#18136, ci-etcd-robustness-{arm64,amd64} were a duplication of the main branch jobs. --- config/jobs/etcd/etcd-periodics.yaml | 94 ------------------- .../testgrids/kubernetes/sig-etcd/config.yaml | 26 ----- 2 files changed, 120 deletions(-) diff --git a/config/jobs/etcd/etcd-periodics.yaml b/config/jobs/etcd/etcd-periodics.yaml index ff408cf4f868..fdeefbe15eca 100644 --- a/config/jobs/etcd/etcd-periodics.yaml +++ b/config/jobs/etcd/etcd-periodics.yaml @@ -100,100 +100,6 @@ periodics: nodeSelector: kubernetes.io/arch: amd64 -- name: ci-etcd-robustness-amd64 - interval: 24h - cluster: k8s-infra-prow-build - decorate: true - decoration_config: - timeout: 210m - extra_refs: - - org: etcd-io - repo: etcd - base_ref: main - annotations: - testgrid-create-test-group: 'true' - spec: - containers: - - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master - command: - - runner.sh - args: - - bash - - -c - - | - result=0 - apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 - sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf - make install-lazyfs - set -euo pipefail - GO_TEST_FLAGS="-v --count 120 --timeout '200m' --run TestRobustnessExploratory" - make gofail-enable - make build - VERBOSE=1 GOOS=linux GOARCH=amd64 CPU=8 EXPECT_DEBUG=true GO_TEST_FLAGS=${GO_TEST_FLAGS} RESULTS_DIR=/data/results make test-robustness || result=$? - if [ -d /data/results ]; then - zip -r ${ARTIFACTS}/results.zip /data/results - fi - exit $result - resources: - requests: - cpu: "7" - memory: "14Gi" - limits: - cpu: "7" - memory: "14Gi" - # fuse needs privileged mode - securityContext: - privileged: true - nodeSelector: - kubernetes.io/arch: amd64 - -- name: ci-etcd-robustness-arm64 - interval: 24h - cluster: k8s-infra-prow-build - decorate: true - decoration_config: - timeout: 210m - extra_refs: - - org: etcd-io - repo: etcd - base_ref: main - annotations: - testgrid-create-test-group: 'true' - spec: - containers: - - image: us-central1-docker.pkg.dev/k8s-staging-test-infra/images/kubekins-e2e:v20240705-131cd74733-master - command: - - runner.sh - args: - - bash - - -c - - | - result=0 - apt-get -o APT::Update::Error-Mode=any update && apt-get --yes install cmake libfuse3-dev libfuse3-3 fuse3 - sed -i 's/#user_allow_other/user_allow_other/g' /etc/fuse.conf - make install-lazyfs - set -euo pipefail - GO_TEST_FLAGS="-v --count 120 --timeout '200m' --run TestRobustnessExploratory" - make gofail-enable - make build - VERBOSE=1 GOOS=linux GOARCH=arm64 CPU=8 EXPECT_DEBUG=true GO_TEST_FLAGS=${GO_TEST_FLAGS} RESULTS_DIR=/data/results make test-robustness || result=$? - if [ -d /data/results ]; then - zip -r ${ARTIFACTS}/results.zip /data/results - fi - exit $result - resources: - requests: - cpu: "7" - memory: "14Gi" - limits: - cpu: "7" - memory: "14Gi" - # fuse needs privileged mode - securityContext: - privileged: true - nodeSelector: - kubernetes.io/arch: arm64 - - name: ci-etcd-robustness-main-amd64 interval: 24h cluster: k8s-infra-prow-build diff --git a/config/testgrids/kubernetes/sig-etcd/config.yaml b/config/testgrids/kubernetes/sig-etcd/config.yaml index 26b65e690cb9..a14d2c3d4b7c 100644 --- a/config/testgrids/kubernetes/sig-etcd/config.yaml +++ b/config/testgrids/kubernetes/sig-etcd/config.yaml @@ -18,32 +18,6 @@ dashboards: - name: sig-etcd-postsubmits - name: sig-etcd-robustness dashboard_tab: - - name: ci-etcd-robustness-amd64 - test_group_name: ci-etcd-robustness-amd64 - file_bug_template: - url: https://github.com/etcd-io/etcd/issues/new - options: - - key: template - value: bug-report.yml - - key: title - value: '[robustness tests] main-amd64: ' - - key: problem - value: - - key: etcdVersion - value: v3.6 - - name: ci-etcd-robustness-arm64 - test_group_name: ci-etcd-robustness-arm64 - file_bug_template: - url: https://github.com/etcd-io/etcd/issues/new - options: - - key: template - value: bug-report.yml - - key: title - value: '[robustness tests] main-arm64: ' - - key: problem - value: - - key: etcdVersion - value: v3.6 - name: ci-etcd-robustness-main-amd64 test_group_name: ci-etcd-robustness-main-amd64 file_bug_template: