Skip to content

Commit e1b0a3e

Browse files
tremestremes
authored
remove the e2e test that is not used (#354)
* remove the e2e test that is not used * boilerplate update
1 parent 93253c0 commit e1b0a3e

File tree

10 files changed

+18
-389
lines changed

10 files changed

+18
-389
lines changed

Diff for: ‎boilerplate/_data/last-boilerplate-commit

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
c10f759a4ab9edd0fbab1036764e50f1cb8ecb25
1+
fba9eb19b4b76a4bf339d25adcdc2742c1dda1c0

Diff for: ‎boilerplate/openshift/golang-osd-operator/build-opm-catalog.sh

+10-2
Original file line numberDiff line numberDiff line change
@@ -227,6 +227,14 @@ function build_opm_catalog() {
227227
from_arg="--from-index $OLM_CATALOG_IMAGE:$prev_commit"
228228
fi
229229

230+
# check if the previous catalog image is available
231+
if [ $(${image_builder} pull ${previous_catalog_image} &> /dev/null;echo $?) -gt 0 ]; then
232+
# remove the first character
233+
prev_commit=${prev_commit:1}
234+
from_arg="--from-index $OLM_CATALOG_IMAGE:$prev_commit"
235+
fi
236+
237+
log "Index argument is $from_arg"
230238
log "Creating catalog image $catalog_image_current_commit using opm"
231239
# shellcheck disable=SC2086
232240
$opm_local_executable index add --bundles "$bundle_image_current_commit" \
@@ -338,9 +346,9 @@ function main() {
338346
return 0
339347
fi
340348

341-
local bundle_image_current_commit="$OLM_BUNDLE_IMAGE:$CURRENT_COMMIT"
349+
local bundle_image_current_commit="${OLM_BUNDLE_IMAGE}:g${CURRENT_COMMIT}"
342350
local bundle_image_latest="$OLM_BUNDLE_IMAGE:latest"
343-
local catalog_image_current_commit="$OLM_CATALOG_IMAGE:$CURRENT_COMMIT"
351+
local catalog_image_current_commit="{$OLM_CATALOG_IMAGE}:g${CURRENT_COMMIT}"
344352
local catalog_image_latest="$OLM_CATALOG_IMAGE:latest"
345353

346354
bundle_image_current_commit=$(build_opm_bundle "${temp_dir}" \

Diff for: ‎boilerplate/openshift/golang-osd-operator/csv-generate/catalog-publish.sh

+5
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,11 @@ BUNDLE_DIR="${SAAS_OPERATOR_DIR}/${operator_name}"
4141
OPERATOR_NEW_VERSION=$(ls "${BUNDLE_DIR}" | sort -t . -k 3 -g | tail -n 1)
4242
OPERATOR_PREV_VERSION=$(ls "${BUNDLE_DIR}" | sort -t . -k 3 -g | tail -n 2 | head -n 1)
4343

44+
if [[ "$OPERATOR_NEW_VERSION" == "$OPERATOR_PREV_VERSION" ]]; then
45+
echo "New version and previous version are identical. Exiting."
46+
exit 1
47+
fi
48+
4449
# Get container engine
4550
CONTAINER_ENGINE=$(command -v podman || command -v docker || true)
4651
[[ -n "$CONTAINER_ENGINE" ]] || echo "WARNING: Couldn't find a container engine. Assuming you already in a container, running unit tests." >&2

Diff for: ‎go.mod

+1-10
Original file line numberDiff line numberDiff line change
@@ -8,12 +8,9 @@ require (
88
github.com/ghodss/yaml v1.0.1-0.20190212211648-25d852aebe32
99
github.com/go-logr/logr v1.4.2
1010
github.com/mcuadros/go-defaults v1.2.0
11-
github.com/onsi/ginkgo/v2 v2.17.2
12-
github.com/onsi/gomega v1.33.1
1311
github.com/openshift/api v0.0.0-20230406152840-ce21e3fe5da2
1412
github.com/prometheus/client_golang v1.19.1
1513
github.com/prometheus/client_model v0.6.1
16-
github.com/prometheus/common v0.55.0
1714
github.com/spf13/pflag v1.0.5
1815
github.com/spf13/viper v1.17.0
1916
github.com/stretchr/testify v1.9.0
@@ -23,7 +20,6 @@ require (
2320
k8s.io/apimachinery v0.30.3
2421
k8s.io/client-go v0.30.3
2522
sigs.k8s.io/controller-runtime v0.18.4
26-
sigs.k8s.io/e2e-framework v0.2.0
2723
)
2824

2925
require (
@@ -59,7 +55,6 @@ require (
5955
github.com/go-openapi/jsonpointer v0.21.0 // indirect
6056
github.com/go-openapi/jsonreference v0.21.0 // indirect
6157
github.com/go-openapi/swag v0.23.0 // indirect
62-
github.com/go-task/slim-sprig/v3 v3.0.0 // indirect
6358
github.com/gobwas/glob v0.2.3 // indirect
6459
github.com/gogo/protobuf v1.3.2 // indirect
6560
github.com/golang/groupcache v0.0.0-20210331224755-41bb18bfe9da // indirect
@@ -68,11 +63,9 @@ require (
6863
github.com/google/gnostic-models v0.6.8 // indirect
6964
github.com/google/go-cmp v0.6.0 // indirect
7065
github.com/google/gofuzz v1.2.0 // indirect
71-
github.com/google/pprof v0.0.0-20240424215950-a892ee059fd6 // indirect
7266
github.com/google/shlex v0.0.0-20191202100458-e7afc7fbc510 // indirect
7367
github.com/google/uuid v1.6.0 // indirect
7468
github.com/gorilla/mux v1.8.0 // indirect
75-
github.com/gorilla/websocket v1.5.0 // indirect
7669
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 // indirect
7770
github.com/hashicorp/hcl v1.0.1-vault-5 // indirect
7871
github.com/huandu/xstrings v1.4.0 // indirect
@@ -89,21 +82,20 @@ require (
8982
github.com/mitchellh/mapstructure v1.5.0 // indirect
9083
github.com/mitchellh/reflectwalk v1.0.2 // indirect
9184
github.com/moby/locker v1.0.1 // indirect
92-
github.com/moby/spdystream v0.2.0 // indirect
9385
github.com/moby/term v0.5.0 // indirect
9486
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
9587
github.com/modern-go/reflect2 v1.0.2 // indirect
9688
github.com/monochromegane/go-gitignore v0.0.0-20200626010858-205db1a8cc00 // indirect
9789
github.com/morikuni/aec v1.0.0 // indirect
9890
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
99-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
10091
github.com/opencontainers/go-digest v1.0.0 // indirect
10192
github.com/opencontainers/image-spec v1.1.0-rc5 // indirect
10293
github.com/pelletier/go-toml/v2 v2.1.0 // indirect
10394
github.com/peterbourgon/diskv v2.0.1+incompatible // indirect
10495
github.com/pkg/errors v0.9.1 // indirect
10596
github.com/pmezard/go-difflib v1.0.1-0.20181226105442-5d4384ee4fb2 // indirect
10697
github.com/prometheus-operator/prometheus-operator/pkg/apis/monitoring v0.68.0 // indirect
98+
github.com/prometheus/common v0.55.0 // indirect
10799
github.com/prometheus/procfs v0.15.1 // indirect
108100
github.com/sagikazarmark/locafero v0.3.0 // indirect
109101
github.com/sagikazarmark/slog-shim v0.1.0 // indirect
@@ -133,7 +125,6 @@ require (
133125
golang.org/x/term v0.22.0 // indirect
134126
golang.org/x/text v0.16.0 // indirect
135127
golang.org/x/time v0.5.0 // indirect
136-
golang.org/x/tools v0.23.0 // indirect
137128
gomodules.xyz/jsonpatch/v2 v2.4.0 // indirect
138129
google.golang.org/genproto/googleapis/rpc v0.0.0-20230920204549-e6e6cdab5c13 // indirect
139130
google.golang.org/grpc v1.58.3 // indirect

Diff for: ‎go.sum

+1-13
Original file line numberDiff line numberDiff line change
@@ -59,8 +59,6 @@ github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d h1:UrqY+r/O
5959
github.com/Shopify/logrus-bugsnag v0.0.0-20171204204709-577dee27f20d/go.mod h1:HI8ITrYtUY+O+ZhtlqUnD8+KwNPOyugEhfP9fdUIaEQ=
6060
github.com/alecthomas/template v0.0.0-20160405071501-a0175ee3bccc/go.mod h1:LOuyumcjzFXgccqObfd/Ljyb9UuFJ6TxHnclSeseNhc=
6161
github.com/alecthomas/units v0.0.0-20151022065526-2efee857e7cf/go.mod h1:ybxpYRFXyAe+OPACYpWeL0wqObRcbAqCMya13uyzqw0=
62-
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5 h1:0CwZNZbxp69SHPdPJAN/hZIm0C4OItdklCFmMRWYpio=
63-
github.com/armon/go-socks5 v0.0.0-20160902184237-e75332964ef5/go.mod h1:wHh0iHkYZB8zMSxRWpUBQtwG5a7fFgvEO+odwuTv2gs=
6462
github.com/beorn7/perks v0.0.0-20180321164747-3a771d992973/go.mod h1:Dwedo/Wpr24TaqPxmxbtue+5NUziq4I4S80YR8gNf3Q=
6563
github.com/beorn7/perks v1.0.0/go.mod h1:KWe93zE9D1o94FZ5RNwFwVgaQK1VOXiVxmqh+CedLV8=
6664
github.com/beorn7/perks v1.0.1 h1:VlbKKnNfV8bJzeqoa4cOKqO6bYr3WgKZxO8Z16+hsOM=
@@ -167,6 +165,7 @@ github.com/go-openapi/jsonreference v0.21.0/go.mod h1:LmZmgsrTkVg9LG4EaHeY8cBDsl
167165
github.com/go-openapi/swag v0.23.0 h1:vsEVJDUo2hPJ2tu0/Xc+4noaxyEffXNIs3cOULZ+GrE=
168166
github.com/go-openapi/swag v0.23.0/go.mod h1:esZ8ITTYEsH1V2trKHjAN8Ai7xHb8RV+YSZ577vPjgQ=
169167
github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY=
168+
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 h1:tfuBGBXKqDEevZMzYi5KSi8KkcZtzBcTgAUUtapy0OI=
170169
github.com/go-task/slim-sprig/v3 v3.0.0 h1:sUs3vkvUymDpBKi3qH1YSqBQk9+9D/8M2mN1vB6EwHI=
171170
github.com/go-task/slim-sprig/v3 v3.0.0/go.mod h1:W848ghGpv3Qj3dhTPRyJypKRiqCdHZiAzKg9hl15HA8=
172171
github.com/gobwas/glob v0.2.3 h1:A4xDbljILXROh+kObIiy5kIaPYD8e96x1tgBhUI5J+Y=
@@ -256,9 +255,6 @@ github.com/gorilla/handlers v1.5.1 h1:9lRY6j8DEeeBT10CvO9hGW0gmky0BprnvDI5vfhUHH
256255
github.com/gorilla/handlers v1.5.1/go.mod h1:t8XrUpc4KVXb7HGyJ4/cEnwQiaxrX/hz1Zv/4g96P1Q=
257256
github.com/gorilla/mux v1.8.0 h1:i40aqfkR1h2SlN9hojwV5ZA91wcXFOvkdNIeFDP5koI=
258257
github.com/gorilla/mux v1.8.0/go.mod h1:DVbg23sWSpFRCP0SfiEN6jmj59UnW/n46BH5rLB71So=
259-
github.com/gorilla/websocket v1.4.2/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
260-
github.com/gorilla/websocket v1.5.0 h1:PPwGk2jz7EePpoHN/+ClbZu8SPxiqlu12wZP/3sWmnc=
261-
github.com/gorilla/websocket v1.5.0/go.mod h1:YR8l580nyteQvAITg2hZ9XVh4b55+EU/adAjf1fMHhE=
262258
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79 h1:+ngKgrYPPJrOjhax5N+uePQ0Fh1Z7PheYoUI/0nzkPA=
263259
github.com/gregjones/httpcache v0.0.0-20190611155906-901d90724c79/go.mod h1:FecbI9+v66THATjSRHfNgh1IVFe/9kFxbXtjV0ctIMA=
264260
github.com/hashicorp/golang-lru v0.5.0/go.mod h1:/m3WP610KZHVQ1SGc6re/UDhFvYD7pJ4Ao+sR/qLZy8=
@@ -324,8 +320,6 @@ github.com/mitchellh/reflectwalk v1.0.2 h1:G2LzWKi524PWgd3mLHV8Y5k7s6XUvT0Gef6zx
324320
github.com/mitchellh/reflectwalk v1.0.2/go.mod h1:mSTlrgnPZtwu0c4WaC2kGObEpuNDbx0jmZXqmk4esnw=
325321
github.com/moby/locker v1.0.1 h1:fOXqR41zeveg4fFODix+1Ch4mj/gT0NE1XJbp/epuBg=
326322
github.com/moby/locker v1.0.1/go.mod h1:S7SDdo5zpBK84bzzVlKr2V0hz+7x9hWbYC/kq7oQppc=
327-
github.com/moby/spdystream v0.2.0 h1:cjW1zVyyoiM0T7b6UoySUFqzXMoqRckQtXwGPiBhOM8=
328-
github.com/moby/spdystream v0.2.0/go.mod h1:f7i0iNDQJ059oMTcWxx8MA/zKFIuD/lY+0GqbN2Wy8c=
329323
github.com/moby/sys/mountinfo v0.6.2 h1:BzJjoreD5BMFNmD9Rus6gdd1pLuecOFPt8wC+Vygl78=
330324
github.com/moby/sys/mountinfo v0.6.2/go.mod h1:IJb6JQeOklcdMU9F5xQ8ZALD+CUr5VlGpwtX+VE0rpI=
331325
github.com/moby/term v0.5.0 h1:xt8Q1nalod/v7BqbG21f8mQPqH+xAaC9C3N3wfWbVP0=
@@ -344,8 +338,6 @@ github.com/morikuni/aec v1.0.0/go.mod h1:BbKIizmSmc5MMPqRYbxO4ZU0S0+P200+tUnFx7P
344338
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 h1:C3w9PqII01/Oq1c1nUAm88MOHcQC9l5mIlSMApZMrHA=
345339
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822/go.mod h1:+n7T8mK8HuQTcFwEeznm/DIxMOiR9yIdICNftLE1DvQ=
346340
github.com/mwitkow/go-conntrack v0.0.0-20161129095857-cc309e4a2223/go.mod h1:qRWi+5nqEBWmkhHvq77mSJWrCKwh8bxhgT7d/eI7P4U=
347-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f h1:y5//uYreIhSUg3J1GEMiLbxo1LJaP8RfCpH6pymGZus=
348-
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f/go.mod h1:ZdcZmHo+o7JKHSa8/e818NopupXU1YMK5fe1lsApnBw=
349341
github.com/niemeyer/pretty v0.0.0-20200227124842-a10e7caefd8e/go.mod h1:zD1mROLANZcx1PVRCS0qkT7pwLkGfwJo4zjcN/Tysno=
350342
github.com/onsi/ginkgo/v2 v2.17.2 h1:7eMhcy3GimbsA3hEnVKdw/PQM9XN9krpKVXsZdph0/g=
351343
github.com/onsi/ginkgo/v2 v2.17.2/go.mod h1:nP2DPOQoNsQmsVyv5rDA8JkXQoCs6goXIvr/PRJ1eCc=
@@ -438,8 +430,6 @@ github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsT
438430
github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
439431
github.com/subosito/gotenv v1.6.0 h1:9NlTDc1FTs4qu0DDq7AEtTPNw6SVm7uBMsUCUjABIf8=
440432
github.com/subosito/gotenv v1.6.0/go.mod h1:Dk4QP5c2W3ibzajGcXpNraDfq2IrhjMIvMSWPKKo0FU=
441-
github.com/vladimirvivien/gexe v0.2.0 h1:nbdAQ6vbZ+ZNsolCgSVb9Fno60kzSuvtzVh6Ytqi/xY=
442-
github.com/vladimirvivien/gexe v0.2.0/go.mod h1:LHQL00w/7gDUKIak24n801ABp8C+ni6eBht9vGVst8w=
443433
github.com/xeipuuv/gojsonpointer v0.0.0-20180127040702-4e3ac2762d5f/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
444434
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb h1:zGWFAtiMcyryUHoUjUJX0/lt1H2+i2Ka2n+D3DImSNo=
445435
github.com/xeipuuv/gojsonpointer v0.0.0-20190905194746-02993c407bfb/go.mod h1:N2zxlSyiKSe5eX1tZViRH5QA0qijqEDrYZiPEAiq3wU=
@@ -876,8 +866,6 @@ rsc.io/quote/v3 v3.1.0/go.mod h1:yEA65RcK8LyAZtP9Kv3t0HmxON59tX3rD+tICJqUlj0=
876866
rsc.io/sampler v1.3.0/go.mod h1:T1hPZKmBbMNahiBKFy5HrXp6adAjACjK9JXDnKaTXpA=
877867
sigs.k8s.io/controller-runtime v0.18.4 h1:87+guW1zhvuPLh1PHybKdYFLU0YJp4FhJRmiHvm5BZw=
878868
sigs.k8s.io/controller-runtime v0.18.4/go.mod h1:TVoGrfdpbA9VRFaRnKgk9P5/atA0pMwq+f+msb9M8Sg=
879-
sigs.k8s.io/e2e-framework v0.2.0 h1:gD6AWWAHFcHibI69E9TgkNFhh0mVwWtRCHy2RU057jQ=
880-
sigs.k8s.io/e2e-framework v0.2.0/go.mod h1:E6JXj/V4PIlb95jsn2WrNKG+Shb45xaaI7C0+BH4PL8=
881869
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd h1:EDPBXCAspyGV4jQlpZSudPeMmr1bNJefnuqLsRAsHZo=
882870
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd/go.mod h1:B8JuhiUyNFVKdsE8h686QcCxMaH6HrOAZj4vswFpcB0=
883871
sigs.k8s.io/kustomize/api v0.13.5-0.20230601165947-6ce0bf390ce3 h1:XX3Ajgzov2RKUdc5jW3t5jwY7Bo7dcRm+tFxT+NfgY0=

Diff for: ‎internal/testing/client.go

-89
This file was deleted.

Diff for: ‎internal/testing/loader.go

-39
This file was deleted.

Diff for: ‎internal/testing/prom_client.go

-84
This file was deleted.

0 commit comments

Comments
 (0)