Skip to content

Commit 5eac1c1

Browse files
committed
k8s build version modified and cosmetic changes
1 parent 753623b commit 5eac1c1

File tree

10 files changed

+34
-34
lines changed

10 files changed

+34
-34
lines changed

config/jobs/periodic/knative-extensions/eventing-kafka-broker/eventing-kafka-broker-main.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ periodics:
3535
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO
@@ -96,7 +96,7 @@ periodics:
9696
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
9797
ORIGINAL_DIR=$(pwd)
9898
99-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
99+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
100100
101101
source cluster-setup.sh create
102102
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO
@@ -157,7 +157,7 @@ periodics:
157157
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
158158
ORIGINAL_DIR=$(pwd)
159159
160-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
160+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
161161
162162
source cluster-setup.sh create
163163
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO

config/jobs/periodic/knative-extensions/eventing-kafka-broker/eventing-kafka-broker-release-1.17.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ periodics:
3535
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO
@@ -96,7 +96,7 @@ periodics:
9696
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
9797
ORIGINAL_DIR=$(pwd)
9898
99-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
99+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
100100
101101
source cluster-setup.sh create
102102
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO
@@ -157,7 +157,7 @@ periodics:
157157
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
158158
ORIGINAL_DIR=$(pwd)
159159
160-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
160+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
161161
162162
source cluster-setup.sh create
163163
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO

config/jobs/periodic/knative-extensions/kn-plugin-event/kn-plugin-event-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
export KO_DEFAULTBASEIMAGE="gcr.io/distroless/static:nonroot"

config/jobs/periodic/knative-extensions/kn-plugin-event/kn-plugin-event-release-1.17.yaml renamed to config/jobs/periodic/knative-extensions/kn-plugin-event/kn-plugin-event-release-1.18.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
periodics:
2-
- name: knative-plugin-event-release-1.17-periodic
2+
- name: knative-plugin-event-release-1.18-periodic
33
labels:
44
preset-knative-powervs: "true"
55
decorate: true
@@ -9,7 +9,7 @@ periodics:
99
org: ppc64le-cloud
1010
repo: knative-tkn-upstream-ci
1111
workdir: true
12-
- base_ref: release-1.17
12+
- base_ref: release-1.18
1313
org: knative-extensions
1414
repo: kn-plugin-event
1515
spec:
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
export KO_DEFAULTBASEIMAGE="gcr.io/distroless/static:nonroot"
@@ -50,6 +50,6 @@ periodics:
5050
- name: KNATIVE_REPO
5151
value: kn-plugin-event
5252
- name: KNATIVE_RELEASE
53-
value: release-1.17
53+
value: release-1.18
5454
- name: SSL_CERT_FILE
5555
value: /etc/ssl/certs/ca-certificates.crt

config/jobs/periodic/knative/client/client-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO

config/jobs/periodic/knative/client/client-release-1.17.yaml renamed to config/jobs/periodic/knative/client/client-release-1.18.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
periodics:
2-
- name: knative-client-release-1.17-periodic
2+
- name: knative-client-release-1.18-periodic
33
labels:
44
preset-knative-powervs: "true"
55
decorate: true
@@ -9,7 +9,7 @@ periodics:
99
org: ppc64le-cloud
1010
repo: knative-tkn-upstream-ci
1111
workdir: true
12-
- base_ref: release-1.17
12+
- base_ref: release-1.18
1313
org: knative
1414
repo: client
1515
spec:
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO
@@ -49,7 +49,7 @@ periodics:
4949
- name: KNATIVE_REPO
5050
value: client
5151
- name: KNATIVE_RELEASE
52-
value: release-1.17
52+
value: release-1.18
5353
- name: INGRESS_CLASS
5454
value: contour.ingress.networking.knative.dev
5555
- name: SSL_CERT_FILE

config/jobs/periodic/knative/eventing/eventing-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO

config/jobs/periodic/knative/eventing/eventing-release-1.17.yaml renamed to config/jobs/periodic/knative/eventing/eventing-release-1.18.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
periodics:
2-
- name: knative-eventing-release-1.17-periodic
2+
- name: knative-eventing-release-1.18-periodic
33
labels:
44
preset-knative-powervs: "true"
55
decorate: true
@@ -9,7 +9,7 @@ periodics:
99
org: ppc64le-cloud
1010
repo: knative-tkn-upstream-ci
1111
workdir: true
12-
- base_ref: release-1.17
12+
- base_ref: release-1.18
1313
org: knative
1414
repo: eventing
1515
spec:
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO
@@ -49,7 +49,7 @@ periodics:
4949
- name: KNATIVE_REPO
5050
value: eventing
5151
- name: KNATIVE_RELEASE
52-
value: release-1.17
52+
value: release-1.18
5353
- name: SYSTEM_NAMESPACE
5454
value: knative-eventing
5555
- name: SCALE_CHAOSDUCK_TO_ZERO

config/jobs/periodic/knative/operator/operator-main.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO

config/jobs/periodic/knative/operator/operator-release-1.17.yaml renamed to config/jobs/periodic/knative/operator/operator-release-1.18.yaml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
periodics:
2-
- name: knative-operator-release-1.17-periodic
2+
- name: knative-operator-release-1.18-periodic
33
labels:
44
preset-knative-powervs: "true"
55
decorate: true
@@ -9,7 +9,7 @@ periodics:
99
org: ppc64le-cloud
1010
repo: knative-tkn-upstream-ci
1111
workdir: true
12-
- base_ref: release-1.17
12+
- base_ref: release-1.18
1313
org: knative
1414
repo: operator
1515
spec:
@@ -32,10 +32,10 @@ periodics:
3232
set -o xtrace
3333
3434
TIMESTAMP=$(date +%s)
35-
K8S_BUILD_VERSION=$(curl https://storage.googleapis.com/kubernetes-release/release/stable.txt)
35+
K8S_BUILD_VERSION=$(curl -L -s https://dl.k8s.io/release/stable.txt)
3636
ORIGINAL_DIR=$(pwd)
3737
38-
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete' EXIT
38+
trap 'pushd $ORIGINAL_DIR; source cluster-setup.sh delete; popd' EXIT
3939
4040
source cluster-setup.sh create
4141
pushd $GOPATH/src/github.com/$ORG/$KNATIVE_REPO
@@ -49,6 +49,6 @@ periodics:
4949
- name: KNATIVE_REPO
5050
value: operator
5151
- name: KNATIVE_RELEASE
52-
value: release-1.17
52+
value: release-1.18
5353
- name: INGRESS_CLASS
5454
value: contour.ingress.networking.knative.dev

0 commit comments

Comments
 (0)