Skip to content

Commit f03c40f

Browse files
k8s-ci-robotk8s-ci-robot
authored
Merge pull request #16764 from ameukam/drop-kops-ci-ref
Drop kops-ci references
2 parents 5d4d867 + d7e3c61 commit f03c40f

File tree

9 files changed

+16
-16
lines changed

9 files changed

+16
-16
lines changed

‎docs/contributing/test_versions.md‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,15 +11,15 @@ After each successful merge to a release branch, the build is made available thr
1111

1212
| branch | marker |
1313
|--------|--------|
14-
| https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt | master branch |
14+
| https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt | master branch |
1515
| https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.21/latest-ci.txt | kOps 1.21 release branch |
1616
| https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-1.22/latest-ci.txt | kOps 1.22 release branch |
1717

1818
You can create a cluster using these markers using the following scripts:
1919

2020
```sh
21-
marker="https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt"
22-
export KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
21+
marker="https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt"
22+
export KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)"
2323
wget -q "$KOPS_BASE_URL/$(go env GOOS)/$(go env GOARCH)/kops"
2424
chmod +x ./kops
2525
./kops version
@@ -34,8 +34,8 @@ When a PR builds successfully, you can test the PR using the following script:
3434
```sh
3535
pr=13208
3636
sha=$(curl -s -H "Accept: application/vnd.github.v3+json" https://api.github.com/repos/kubernetes/kops/pulls/${pr} | jq -r .head.sha )
37-
export KOPS_BASE_URL="https://storage.googleapis.com/kops-ci/pulls/pull-kops-e2e-kubernetes-aws/pull-${sha}"
37+
export KOPS_BASE_URL="https://storage.googleapis.com/k8s-staging-kops/pulls/pull-kops-aws-distro-debian12/pull-${sha}"
3838
wget -q "$KOPS_BASE_URL/$(go env GOOS)/$(go env GOARCH)/kops"
3939
chmod +x ./kops
4040
./kops version
41-
```
41+
```

‎tests/e2e/e2e.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ test-e2e-aws-simple-1-20: test-e2e-install
2727
-v 2 \
2828
--build --up --down \
2929
--cloud-provider=aws \
30-
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt \
30+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt \
3131
--kubernetes-version=https://dl.k8s.io/release/stable-1.20.txt \
3232
--template-path=tests/e2e/templates/simple.yaml.tmpl \
3333
--test=kops \

‎tests/e2e/pkg/kops/download.go‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import (
2828

2929
// DownloadKops will download the kops binary from the version marker URL
3030
// Returning the URL to use for KOPS_BASE_URL
31-
// Example markerURL: https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt
31+
// Example markerURL: https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt
3232
func DownloadKops(markerURL, downloadPath string) (string, error) {
3333
var b bytes.Buffer
3434
if err := util.HTTPGETWithHeaders(markerURL, nil, &b); err != nil {

‎tests/e2e/scenarios/aws-boskos/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ fi
5656

5757
# Download latest prebuilt kOps
5858
if [[ -z "${KOPS_BASE_URL:-}" ]]; then
59-
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
59+
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)"
6060
fi
6161
export KOPS_BASE_URL
6262

‎tests/e2e/scenarios/build/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ cd "${GOPATH}"/src/k8s.io/kubernetes
2626
kubetest2 kops -v=6 \
2727
--up --down --build --build-kubernetes=true --target-build-arch=linux/amd64 \
2828
--cloud-provider=gce --admin-access=0.0.0.0/0 \
29-
--kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci.txt \
29+
--kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci.txt \
3030
--create-args "--gce-service-account=default --networking=kubenet --set=spec.nodeProblemDetector.enabled=true" \
3131
--test=kops \
3232
-- \

‎tests/e2e/scenarios/cilium-connectivity-test/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ REPO_ROOT=$(git rev-parse --show-toplevel);
1818
source "${REPO_ROOT}"/tests/e2e/scenarios/lib/common.sh
1919

2020
export KOPS_BASE_URL
21-
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
21+
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)"
2222
KOPS=$(kops-download-from-base)
2323

2424
ARGS="--set=cluster.spec.networking.cilium.hubble.enabled=true --set=cluster.spec.certManager.enabled=true"

‎tests/e2e/scenarios/kops-upgrade/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ ${KUBETEST2} \
3434
--create-args="--networking calico"
3535

3636
export KOPS_BASE_URL
37-
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
37+
KOPS_BASE_URL="$(curl -s https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)"
3838
KOPS=$(kops-download-from-base)
3939

4040
"${KOPS}" update cluster

‎tests/e2e/scenarios/lib/common.sh‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export CHANNELS
4141

4242
export KOPS_RUN_TOO_NEW_VERSION=1
4343

44-
if [[ -z "${DISCOVERY_STORE-}" ]]; then
44+
if [[ -z "${DISCOVERY_STORE-}" ]]; then
4545
DISCOVERY_STORE="${KOPS_STATE_STORE-}"
4646
fi
4747

@@ -98,7 +98,7 @@ function kops-base-from-marker() {
9898
if [[ "${1}" =~ ^https: ]]; then
9999
curl -fs "${1}"
100100
elif [[ "${1}" == "latest" ]]; then
101-
curl -fs "https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt"
101+
curl -fs "https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt"
102102
else
103103
curl -fs "https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/release-${1}/latest-ci.txt"
104104
fi
@@ -107,7 +107,7 @@ function kops-base-from-marker() {
107107
# This function will download the latest kops if in a periodic job, otherwise build from the current tree
108108
function kops-acquire-latest() {
109109
if [[ "${JOB_TYPE-}" == "periodic" ]]; then
110-
KOPS_BASE_URL="$(curl -fs https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt)"
110+
KOPS_BASE_URL="$(curl -fs https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt)"
111111
KOPS=$(kops-download-from-base)
112112
CHANNELS=$(kops-channels-download-from-base)
113113
else
@@ -150,4 +150,4 @@ function kops-up() {
150150
--create-args="${create_args}" \
151151
--control-plane-count="${KOPS_CONTROL_PLANE_COUNT:-1}" \
152152
--template-path="${KOPS_TEMPLATE-}"
153-
}
153+
}

‎tests/e2e/scenarios/upgrade-ha-leader-migration/run-test.sh‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ fi
3030

3131
# for periodic job, let kubetest2 fetch latest kops. Otherwise let kubetest2 build.
3232
if [[ "${JOB_TYPE-}" == "periodic" ]]; then
33-
KUBETEST2="${KUBETEST2} --kops-version-marker=https://storage.googleapis.com/kops-ci/bin/latest-ci-updown-green.txt"
33+
KUBETEST2="${KUBETEST2} --kops-version-marker=https://storage.googleapis.com/k8s-staging-kops/kops/releases/markers/master/latest-ci-updown-green.txt"
3434
else
3535
KUBETEST2="${KUBETEST2} --build"
3636
fi

0 commit comments

Comments
 (0)