From 8333bcc6ab016b2df1594f11fd009902b14d0cd8 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 20 Apr 2022 16:11:36 +0000 Subject: [PATCH 1/4] e2e_node: remove unused jenkins/coreos-init.json --- test/e2e_node/jenkins/coreos-init.json | 44 -------------------------- 1 file changed, 44 deletions(-) delete mode 100644 test/e2e_node/jenkins/coreos-init.json diff --git a/test/e2e_node/jenkins/coreos-init.json b/test/e2e_node/jenkins/coreos-init.json deleted file mode 100644 index b8eaf437fe7..00000000000 --- a/test/e2e_node/jenkins/coreos-init.json +++ /dev/null @@ -1,44 +0,0 @@ -{ - "ignition":{"version": "2.0.0"}, - "systemd": { - "units": [{ - "name": "update-engine.service", - "mask": true - }, - { - "name": "locksmithd.service", - "mask": true - }, - { - "name": "docker.service", - "dropins": [{ - "name": "10-disable-systemd-cgroup-driver.conf", - "contents": "[Service]\nCPUAccounting=yes\nMemoryAccounting=yes\nEnvironment=\"DOCKER_CGROUPS=\"" - }] - }] - }, - "passwd": { - "users": [{ - "name": "jenkins", - "create": { - "groups": ["docker", "sudo"] - } - }] - }, - "storage": { - "files": [ - { - "filesystem": "root", - "path": "/etc/ssh/sshd_config", - "contents": { - "source": "data:,%23%20Use%20most%20defaults%20for%20sshd%20configuration.%0AUsePrivilegeSeparation%20sandbox%0ASubsystem%20sftp%20internal-sftp%0AClientAliveInterval%20180%0AUseDNS%20no%0AUsePAM%20yes%0APrintLastLog%20no%20%23%20handled%20by%20PAM%0APrintMotd%20no%20%23%20handled%20by%20PAM%0AAuthenticationMethods%20publickey", - "verification": {} - }, - "mode": 384, - "user": {}, - "group": {} - } - ] - } -} - From d90ba453ce3ac2567fe448a8f559bcfc3a83fb5f Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 20 Apr 2022 16:15:15 +0000 Subject: [PATCH 2/4] e2e_node: remove unused jenkins runner script --- test/e2e_node/jenkins/e2e-node-jenkins.sh | 56 ----------------------- 1 file changed, 56 deletions(-) delete mode 100755 test/e2e_node/jenkins/e2e-node-jenkins.sh diff --git a/test/e2e_node/jenkins/e2e-node-jenkins.sh b/test/e2e_node/jenkins/e2e-node-jenkins.sh deleted file mode 100755 index 00a8a46db0d..00000000000 --- a/test/e2e_node/jenkins/e2e-node-jenkins.sh +++ /dev/null @@ -1,56 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Script executed by jenkins to run node e2e tests against gce -# Usage: test/e2e_node/jenkins/e2e-node-jenkins.sh -# Properties files: -# - test/e2e_node/jenkins/jenkins-ci.properties : for running jenkins ci -# - test/e2e_node/jenkins/jenkins-pull.properties : for running jenkins pull request builder -# - test/e2e_node/jenkins/template.properties : template for creating a properties file to run locally - -set -e -set -x - -: "${1:?Usage test/e2e_node/jenkins/e2e-node-jenkins.sh }" - -. "${1}" - -# Until all GOPATH references are removed from all build scripts as well, -# explicitly disable module mode to avoid picking up user-set GO111MODULE preferences. -# As individual scripts make use of go modules, they can explicitly set GO111MODULE=on -export GO111MODULE=off - -# indirectly generates test/e2e/generated/bindata.go too -make generated_files - -# TODO converge build steps with hack/build-go some day if possible. -go build test/e2e_node/environment/conformance.go - -PARALLELISM=${PARALLELISM:-8} -WORKSPACE=${WORKSPACE:-"/tmp/"} -ARTIFACTS=${WORKSPACE}/_artifacts -TIMEOUT=${TIMEOUT:-"45m"} - -mkdir -p "${ARTIFACTS}" - -go run test/e2e_node/runner/remote/run_remote.go --logtostderr --vmodule=*=4 \ - --ssh-env="gce" --ssh-user="$GCE_USER" --zone="$GCE_ZONE" --project="$GCE_PROJECT" \ - --hosts="$GCE_HOSTS" --images="$GCE_IMAGES" --image-project="$GCE_IMAGE_PROJECT" \ - --image-config-file="$GCE_IMAGE_CONFIG_PATH" --cleanup="$CLEANUP" \ - --results-dir="$ARTIFACTS" --ginkgo-flags="--nodes=$PARALLELISM $GINKGO_FLAGS" \ - --test-timeout="$TIMEOUT" --test_args="$TEST_ARGS --kubelet-flags=\"$KUBELET_ARGS\"" \ - --instance-metadata="$GCE_INSTANCE_METADATA" --system-spec-name="$SYSTEM_SPEC_NAME" \ - --extra-envs="$EXTRA_ENVS" From 3e0041b5b90ddd0fc9a4ac5d7e12d322b3e0f6d1 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 20 Apr 2022 16:15:25 +0000 Subject: [PATCH 3/4] e2e_node: remove copy-e2e-image.sh This script is unused, and the project that was formerly used for e2e node images is in the process of being removed. --- test/e2e_node/jenkins/copy-e2e-image.sh | 44 ------------------------- 1 file changed, 44 deletions(-) delete mode 100755 test/e2e_node/jenkins/copy-e2e-image.sh diff --git a/test/e2e_node/jenkins/copy-e2e-image.sh b/test/e2e_node/jenkins/copy-e2e-image.sh deleted file mode 100755 index 8d1db0bea36..00000000000 --- a/test/e2e_node/jenkins/copy-e2e-image.sh +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env bash - -# Copyright 2016 The Kubernetes Authors. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. - -# Usage: copy-e2e-image.sh - -# See *.properties for list of images to copy, -# typically from kubernetes-node-e2e-images - -set -e - -print_usage() { - echo "This script helps copy a GCE image from a source to a target project" - echo -e "\nUsage:\n$0 \n" -} - -if [ $# -ne 4 ]; then - print_usage - exit 1 -fi - -FROM_IMAGE=$1 -FROM_PROJECT=$2 -TO_PROJECT=$3 -TO_IMAGE=$4 - -echo "Copying image $FROM_IMAGE from project $FROM_PROJECT to project $TO_PROJECT as image $TO_IMAGE..." -gcloud compute --project "${TO_PROJECT}" disks create "${TO_IMAGE}" --image=https://www.googleapis.com/compute/v1/projects/"${FROM_PROJECT}/global/images/""${FROM_IMAGE}" -gcloud compute --project "${TO_PROJECT}" images create "${TO_IMAGE}" \ - --source-disk="${TO_IMAGE}" \ - --description="Cloned from projects/$2/global/images/$1 by $USER on $(date)" -gcloud -q compute --project "${TO_PROJECT}" disks delete "${TO_IMAGE}" From 7151ff8d5cd36d365ca135a7e3de4e328f6baa13 Mon Sep 17 00:00:00 2001 From: Danielle Lancashire Date: Wed, 20 Apr 2022 16:16:57 +0000 Subject: [PATCH 4/4] e2e_node: remove jenkins docker_validation --- .../docker_validation/perf-config.yaml | 58 ------------------- 1 file changed, 58 deletions(-) delete mode 100644 test/e2e_node/jenkins/docker_validation/perf-config.yaml diff --git a/test/e2e_node/jenkins/docker_validation/perf-config.yaml b/test/e2e_node/jenkins/docker_validation/perf-config.yaml deleted file mode 100644 index 91fa65d2d95..00000000000 --- a/test/e2e_node/jenkins/docker_validation/perf-config.yaml +++ /dev/null @@ -1,58 +0,0 @@ ---- -images: - density1: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-1 - tests: - - '.*create 35 pods with 0s? interval \[Benchmark\]' - density2: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-1 - tests: - - '.*create 105 pods with 0s? interval \[Benchmark\]' - density3: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-2 - tests: - - '.*create 105 pods with 0s? interval \[Benchmark\]' - density4: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-1 - tests: - - '.*create 35 pods with 100ms interval \[Benchmark\]' - density5: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-1 - tests: - - '.*create 105 pods with 100ms interval \[Benchmark\]' - density6: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-2 - tests: - - '.*create 105 pods with 100ms interval \[Benchmark\]' - density7: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-1 - tests: - - '.*create 105 pods with 300ms interval \[Benchmark\]' - density8: - image: "{{IMAGE}}" - project: "{{IMAGE_PROJECT}}" - metadata: "{{METADATA}}" - machine: n1-standard-2 - tests: - - '.*create 105 pods with 300ms interval \[Benchmark\]'