Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions .github/workflows/e2e-tests.yaml
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Modified from https://github.com/prometheus-operator/prometheus-operator/blob/main/.github/workflows/e2e-feature-gated.yaml
name: e2e-tests
permissions:
contents: read
on:
push:
branches:
Expand Down Expand Up @@ -42,8 +44,8 @@ jobs:
- name: Run e2e tests
run: |
make test-e2e-4.0.11
e2e-tests-4-1-8:
name: Against netbox version 4.1.8
e2e-tests-4-1-11:
name: Against netbox version 4.1.11
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@692973e3d937129bcbf40652eb9f2f61becf3332 # v4.1.7
Expand All @@ -55,4 +57,4 @@ jobs:
cat ".github/env" >> "$GITHUB_ENV"
- name: Run e2e tests
run: |
make test-e2e-4.1.8
make test-e2e-4.1.11
10 changes: 5 additions & 5 deletions Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -254,9 +254,9 @@ create-kind-4.0.11:
test-e2e-4.0.11: create-kind-4.0.11 deploy-kind install-$(GO_PACKAGE_NAME_CHAINSAW)
chainsaw test $(E2E_PARAM)

.PHONY: create-kind-4.1.8
create-kind-4.1.8:
./kind/local-env.sh --version 4.1.8
.PHONY: test-e2e-4.1.8
test-e2e-4.1.8: create-kind-4.1.8 deploy-kind install-$(GO_PACKAGE_NAME_CHAINSAW)
.PHONY: create-kind-4.1.11
create-kind-4.1.11:
./kind/local-env.sh --version 4.1.11
.PHONY: test-e2e-4.1.11
test-e2e-4.1.11: create-kind-4.1.11 deploy-kind install-$(GO_PACKAGE_NAME_CHAINSAW)
chainsaw test $(E2E_PARAM)
2 changes: 1 addition & 1 deletion docs/examples/example5-multicluster/prepare-demo-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ set -e

# install netbox in the london cluster and load demo data
kubectl config use-context kind-london
./kind/deploy-netbox.sh london "4.1.8" default
./kind/deploy-netbox.sh london "4.1.11" default

# install NetBox Operator
kubectl config use-context kind-london
Expand Down
4 changes: 2 additions & 2 deletions kind/deploy-netbox.sh
Original file line number Diff line number Diff line change
Expand Up @@ -69,13 +69,13 @@ elif [[ "${VERSION}" == "4.0.11" ]] ;then
# patch load-data.sh
sed 's/netbox-demo-v4.1.sql/netbox-demo-v4.0.sql/g' $SCRIPT_DIR/load-data-job/load-data.orig.sh > $SCRIPT_DIR/load-data-job/load-data.sh && chmod +x $SCRIPT_DIR/load-data-job/load-data.sh

elif [[ "${VERSION}" == "4.1.8" ]] ;then
elif [[ "${VERSION}" == "4.1.11" ]] ;then
echo "Using version ${VERSION}"
# need to align with netbox-chart otherwise the creation of the cluster will hang
declare -a Remote_Images=( \
"busybox:1.37.0" \
"docker.io/bitnami/redis:7.4.1-debian-12-r2" \
"ghcr.io/netbox-community/netbox:v4.1.8" \
"ghcr.io/netbox-community/netbox:v4.1.11" \
"ghcr.io/zalando/postgres-operator:v1.12.2" \
"ghcr.io/zalando/spilo-16:3.2-p3" \
)
Expand Down
2 changes: 1 addition & 1 deletion kind/local-env.sh
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
set -e -u -o pipefail

NAMESPACE=""
VERSION="4.1.8" # default value
VERSION="4.1.11" # default value
while [[ $# -gt 0 ]]; do
case $1 in
-n|--namespace)
Expand Down