Skip to content

Commit eda3016

Browse files
metal3-io-botmetal3-io-bot
authored
Merge pull request #2674 from Nordix/e2e_0.11_release
🌱 Add e2e tests for release 0.11
2 parents 070d0e9 + f21179e commit eda3016

File tree

12 files changed

+153
-19
lines changed

12 files changed

+153
-19
lines changed

config/overlays/e2e-release-0.8/ironic.env renamed to config/overlays/e2e-release-0.11/ironic.env

File renamed without changes.

config/overlays/e2e-release-0.8/kustomization.yaml renamed to config/overlays/e2e-release-0.11/kustomization.yaml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@ apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
namespace: baremetal-operator-system
44
resources:
5-
- https://github.com/metal3-io/baremetal-operator/config/overlays/basic-auth_tls?ref=release-0.8&timeout=120s
5+
- https://github.com/metal3-io/baremetal-operator/config/overlays/basic-auth_tls?ref=release-0.11&timeout=120s
66
configMapGenerator:
77
- name: ironic
88
behavior: create
@@ -19,7 +19,7 @@ patches:
1919
name: controller-manager
2020
images:
2121
- name: quay.io/metal3-io/baremetal-operator
22-
newTag: release-0.8
22+
newTag: release-0.11
2323
# We cannot use suffix hashes since the kustomizations we build on
2424
# cannot be aware of what suffixes we add.
2525
generatorOptions:

config/overlays/fixture-release-0.8/kustomization.yaml renamed to config/overlays/fixture-release-0.11/kustomization.yaml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
apiVersion: kustomize.config.k8s.io/v1beta1
22
kind: Kustomization
33
resources:
4-
- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.8
5-
- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.8
4+
- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.11
5+
- https://github.com/metal3-io/baremetal-operator/config/default?ref=release-0.11
66
patches:
77
- patch: |
88
# Enable test mode (fixture provider instead of ironic)
@@ -18,4 +18,4 @@ patches:
1818
name: controller-manager
1919
images:
2020
- name: quay.io/metal3-io/baremetal-operator
21-
newTag: release-0.8
21+
newTag: release-0.11

‎hack/ci-e2e.sh‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,16 +156,18 @@ popd
156156
# Generate credentials
157157
BMO_OVERLAYS=(
158158
"${REPO_ROOT}/config/overlays/e2e"
159-
"${REPO_ROOT}/config/overlays/e2e-release-0.8"
160159
"${REPO_ROOT}/config/overlays/e2e-release-0.9"
161160
"${REPO_ROOT}/config/overlays/e2e-release-0.10"
161+
"${REPO_ROOT}/config/overlays/e2e-release-0.11"
162162
)
163163
IRONIC_OVERLAYS=(
164164
"${REPO_ROOT}/ironic-deployment/overlays/e2e"
165165
"${REPO_ROOT}/ironic-deployment/overlays/e2e-release-26.0"
166166
"${REPO_ROOT}/ironic-deployment/overlays/e2e-release-27.0"
167167
"${REPO_ROOT}/ironic-deployment/overlays/e2e-release-28.0"
168168
"${REPO_ROOT}/ironic-deployment/overlays/e2e-release-29.0"
169+
"${REPO_ROOT}/ironic-deployment/overlays/e2e-release-30.0"
170+
"${REPO_ROOT}/ironic-deployment/overlays/e2e-release-31.0"
169171
)
170172

171173
IRONIC_USERNAME="$(uuidgen)"

‎ironic-deployment/overlays/e2e-release-30.0/ironic-patch.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: ironic
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: ironic-dnsmasq
10+
$patch: delete

‎ironic-deployment/overlays/e2e-release-30.0/ironic_bmo_configmap.env‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
HTTP_PORT=6180
2+
PROVISIONING_INTERFACE=eth0
3+
CACHEURL=http://192.168.222.1/images
4+
IRONIC_HTTP_URL=http://192.168.222.1:6180
5+
IRONIC_BASE_URL=https://192.168.222.1:6385
6+
IRONIC_EXTERNAL_CALLBACK_URL=https://192.168.222.1:6385
7+
IRONIC_KERNEL_PARAMS=console=ttyS0
8+
IRONIC_INSPECTOR_VLAN_INTERFACES=all
9+
USE_IRONIC_INSPECTOR=false

‎ironic-deployment/overlays/e2e-release-30.0/kustomization.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: baremetal-operator-system
4+
resources:
5+
- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.11&timeout=120s
6+
- https://github.com/metal3-io/baremetal-operator/ironic-deployment/base?ref=release-0.11&timeout=120s
7+
8+
components:
9+
- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/basic-auth?ref=release-0.11&timeout=120s
10+
- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/tls?ref=release-0.11&timeout=120s
11+
12+
configMapGenerator:
13+
- envs:
14+
- ironic_bmo_configmap.env
15+
name: ironic-bmo-configmap
16+
behavior: create
17+
18+
patches:
19+
- path: ironic-patch.yaml
20+
# The TLS component adds certificates but it cannot know the exact IPs of our environment.
21+
# Here we patch the certificates to have the correct IPs.
22+
# - 192.168.222.1: management computer IP, forwarded to ironic inside kind
23+
- patch: |-
24+
- op: replace
25+
path: /spec/ipAddresses/0
26+
value: 192.168.222.1
27+
target:
28+
kind: Certificate
29+
name: ironic-cert
30+
31+
images:
32+
- name: quay.io/metal3-io/ironic
33+
newTag: release-30.0
34+
35+
# NOTE: These credentials are generated automatically in hack/ci-e2e.sh
36+
secretGenerator:
37+
- name: ironic-htpasswd
38+
behavior: create
39+
envs:
40+
- ironic-htpasswd

‎ironic-deployment/overlays/e2e-release-31.0/ironic-patch.yaml‎

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
apiVersion: apps/v1
2+
kind: Deployment
3+
metadata:
4+
name: ironic
5+
spec:
6+
template:
7+
spec:
8+
containers:
9+
- name: ironic-dnsmasq
10+
$patch: delete

‎ironic-deployment/overlays/e2e-release-31.0/ironic_bmo_configmap.env‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
HTTP_PORT=6180
2+
PROVISIONING_INTERFACE=eth0
3+
CACHEURL=http://192.168.222.1/images
4+
IRONIC_HTTP_URL=http://192.168.222.1:6180
5+
IRONIC_BASE_URL=https://192.168.222.1:6385
6+
IRONIC_EXTERNAL_CALLBACK_URL=https://192.168.222.1:6385
7+
IRONIC_KERNEL_PARAMS=console=ttyS0
8+
IRONIC_INSPECTOR_VLAN_INTERFACES=all
9+
USE_IRONIC_INSPECTOR=false

‎ironic-deployment/overlays/e2e-release-31.0/kustomization.yaml‎

Lines changed: 40 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
apiVersion: kustomize.config.k8s.io/v1beta1
2+
kind: Kustomization
3+
namespace: baremetal-operator-system
4+
resources:
5+
- https://github.com/metal3-io/baremetal-operator/config/namespace?ref=release-0.11&timeout=120s
6+
- https://github.com/metal3-io/baremetal-operator/ironic-deployment/base?ref=release-0.11&timeout=120s
7+
8+
components:
9+
- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/basic-auth?ref=release-0.11&timeout=120s
10+
- https://github.com/metal3-io/baremetal-operator/ironic-deployment/components/tls?ref=release-0.11&timeout=120s
11+
12+
configMapGenerator:
13+
- envs:
14+
- ironic_bmo_configmap.env
15+
name: ironic-bmo-configmap
16+
behavior: create
17+
18+
patches:
19+
- path: ironic-patch.yaml
20+
# The TLS component adds certificates but it cannot know the exact IPs of our environment.
21+
# Here we patch the certificates to have the correct IPs.
22+
# - 192.168.222.1: management computer IP, forwarded to ironic inside kind
23+
- patch: |-
24+
- op: replace
25+
path: /spec/ipAddresses/0
26+
value: 192.168.222.1
27+
target:
28+
kind: Certificate
29+
name: ironic-cert
30+
31+
images:
32+
- name: quay.io/metal3-io/ironic
33+
newTag: release-31.0
34+
35+
# NOTE: These credentials are generated automatically in hack/ci-e2e.sh
36+
secretGenerator:
37+
- name: ironic-htpasswd
38+
behavior: create
39+
envs:
40+
- ironic-htpasswd

0 commit comments

Comments
 (0)