Skip to content

Commit f03745d

Browse files
maru-avaStephenButtolph
maru-ava
and
StephenButtolph
authored
[ci] Add test binary and image to support bootstrap testing (#3352)
Signed-off-by: marun <[email protected]> Co-authored-by: Stephen Buttolph <[email protected]>
1 parent 7fd21ca commit f03745d

25 files changed

+2269
-65
lines changed

‎.github/workflows/ci.yml

+9
Original file line numberDiff line numberDiff line change
@@ -238,3 +238,12 @@ jobs:
238238
run: bash -x scripts/tests.build_antithesis_images.sh
239239
env:
240240
TEST_SETUP: xsvm
241+
e2e_bootstrap_monitor:
242+
name: Run bootstrap monitor e2e tests
243+
runs-on: ubuntu-latest
244+
steps:
245+
- uses: actions/checkout@v4
246+
- uses: ./.github/actions/setup-go-for-project
247+
- name: Run e2e tests
248+
shell: bash
249+
run: bash -x ./scripts/tests.e2e.bootstrap_monitor.sh

‎.github/workflows/publish_docker_image.yml

+8
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,12 @@ jobs:
2626
DOCKER_USERNAME: ${{ secrets.docker_username }}
2727
DOCKER_PASS: ${{ secrets.docker_pass }}
2828
DOCKER_IMAGE: ${{ secrets.docker_repo }}
29+
BUILD_MULTI_ARCH: 1
2930
run: scripts/build_image.sh
31+
- name: Build and publish bootstrap-monitor image to DockerHub
32+
env:
33+
DOCKER_USERNAME: ${{ secrets.docker_username }}
34+
DOCKER_PASS: ${{ secrets.docker_pass }}
35+
DOCKER_IMAGE: avaplatform/bootstrap-monitor
36+
BUILD_MULTI_ARCH: 1
37+
run: scripts/build_bootstrap_monitor_image.sh

‎Dockerfile

+2-1
Original file line numberDiff line numberDiff line change
@@ -39,10 +39,11 @@ RUN [ -d ./build ] && rm -rf ./build/* || true
3939
# Build avalanchego. The build environment is configured with build_env.sh from the step
4040
# enabling cross-compilation.
4141
ARG RACE_FLAG=""
42+
ARG BUILD_SCRIPT=build.sh
4243
RUN . ./build_env.sh && \
4344
echo "{CC=$CC, TARGETPLATFORM=$TARGETPLATFORM, BUILDPLATFORM=$BUILDPLATFORM}" && \
4445
export GOARCH=$(echo ${TARGETPLATFORM} | cut -d / -f2) && \
45-
./scripts/build.sh ${RACE_FLAG}
46+
./scripts/${BUILD_SCRIPT} ${RACE_FLAG}
4647

4748
# Create this directory in the builder to avoid requiring anything to be executed in the
4849
# potentially emulated execution container.

‎config/viper.go

+5
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,11 @@ const EnvPrefix = "avago"
1919

2020
var DashesToUnderscores = strings.NewReplacer("-", "_")
2121

22+
func EnvVarName(prefix string, key string) string {
23+
// e.g. MY_PREFIX, network-id -> MY_PREFIX_NETWORK_ID
24+
return strings.ToUpper(prefix + "_" + DashesToUnderscores.Replace(key))
25+
}
26+
2227
// BuildViper returns the viper environment from parsing config file from
2328
// default search paths and any parsed command line flags
2429
func BuildViper(fs *pflag.FlagSet, args []string) (*viper.Viper, error) {

‎go.mod

+28-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ require (
2222
github.com/google/uuid v1.6.0
2323
github.com/gorilla/mux v1.8.0
2424
github.com/gorilla/rpc v1.2.0
25-
github.com/gorilla/websocket v1.4.2
25+
github.com/gorilla/websocket v1.5.0
2626
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0
2727
github.com/holiman/uint256 v1.2.4
2828
github.com/huin/goupnp v1.3.0
@@ -69,6 +69,10 @@ require (
6969
google.golang.org/protobuf v1.34.2
7070
gopkg.in/natefinch/lumberjack.v2 v2.0.0
7171
gopkg.in/yaml.v3 v3.0.1
72+
k8s.io/api v0.29.0
73+
k8s.io/apimachinery v0.29.0
74+
k8s.io/client-go v0.29.0
75+
k8s.io/utils v0.0.0-20230726121419-3b25d923346b
7276
)
7377

7478
require (
@@ -96,6 +100,7 @@ require (
96100
github.com/docker/go-connections v0.4.0 // indirect
97101
github.com/docker/go-units v0.5.0 // indirect
98102
github.com/dop251/goja v0.0.0-20230806174421-c933cf95e127 // indirect
103+
github.com/emicklei/go-restful/v3 v3.11.0 // indirect
99104
github.com/ethereum/c-kzg-4844 v0.4.0 // indirect
100105
github.com/frankban/quicktest v1.14.4 // indirect
101106
github.com/fsnotify/fsnotify v1.6.0 // indirect
@@ -105,30 +110,44 @@ require (
105110
github.com/go-logr/logr v1.4.1 // indirect
106111
github.com/go-logr/stdr v1.2.2 // indirect
107112
github.com/go-ole/go-ole v1.3.0 // indirect
113+
github.com/go-openapi/jsonpointer v0.19.6 // indirect
114+
github.com/go-openapi/jsonreference v0.20.2 // indirect
115+
github.com/go-openapi/swag v0.22.3 // indirect
108116
github.com/go-sourcemap/sourcemap v2.1.3+incompatible // indirect
109117
github.com/go-task/slim-sprig v0.0.0-20230315185526-52ccab3ef572 // indirect
110118
github.com/gogo/protobuf v1.3.2 // indirect
111119
github.com/golang/protobuf v1.5.4 // indirect
112120
github.com/golang/snappy v0.0.5-0.20220116011046-fa5810519dcb // indirect
121+
github.com/google/gnostic-models v0.6.8 // indirect
122+
github.com/google/gofuzz v1.2.0 // indirect
113123
github.com/google/pprof v0.0.0-20230207041349-798e818bf904 // indirect
114124
github.com/grpc-ecosystem/grpc-gateway/v2 v2.16.0 // indirect
115125
github.com/hashicorp/go-bexpr v0.1.10 // indirect
116126
github.com/hashicorp/golang-lru v0.5.5-0.20210104140557-80c98217689d // indirect
117127
github.com/hashicorp/hcl v1.0.0 // indirect
118128
github.com/holiman/billy v0.0.0-20240216141850-2abb0c79d3c4 // indirect
119129
github.com/holiman/bloomfilter/v2 v2.0.3 // indirect
130+
github.com/imdario/mergo v0.3.16 // indirect
120131
github.com/inconshreveable/mousetrap v1.0.0 // indirect
132+
github.com/josharian/intern v1.0.0 // indirect
133+
github.com/json-iterator/go v1.1.12 // indirect
121134
github.com/klauspost/compress v1.15.15 // indirect
122135
github.com/kr/pretty v0.3.1 // indirect
123136
github.com/kr/text v0.2.0 // indirect
124137
github.com/magiconair/properties v1.8.6 // indirect
138+
github.com/mailru/easyjson v0.7.7 // indirect
125139
github.com/mattn/go-colorable v0.1.13 // indirect
126140
github.com/mattn/go-isatty v0.0.17 // indirect
127141
github.com/mattn/go-runewidth v0.0.13 // indirect
128142
github.com/mattn/go-shellwords v1.0.12 // indirect
129143
github.com/matttproud/golang_protobuf_extensions v1.0.4 // indirect
130144
github.com/mitchellh/pointerstructure v1.2.0 // indirect
131145
github.com/mmcloughlin/addchain v0.4.0 // indirect
146+
github.com/moby/spdystream v0.2.0 // indirect
147+
github.com/modern-go/concurrent v0.0.0-20180306012644-bacd9c7ef1dd // indirect
148+
github.com/modern-go/reflect2 v1.0.2 // indirect
149+
github.com/munnerz/goautoneg v0.0.0-20191010083416-a7dc8b61c822 // indirect
150+
github.com/mxk/go-flowrate v0.0.0-20140419014527-cca7078d478f // indirect
132151
github.com/olekukonko/tablewriter v0.0.5 // indirect
133152
github.com/opencontainers/go-digest v1.0.0 // indirect
134153
github.com/pelletier/go-toml v1.9.5 // indirect
@@ -156,11 +175,19 @@ require (
156175
go.opentelemetry.io/otel/metric v1.22.0 // indirect
157176
go.opentelemetry.io/proto/otlp v1.0.0 // indirect
158177
go.uber.org/multierr v1.11.0 // indirect
178+
golang.org/x/oauth2 v0.16.0 // indirect
159179
golang.org/x/sys v0.19.0 // indirect
160180
golang.org/x/text v0.14.0 // indirect
161181
golang.org/x/tools v0.17.0 // indirect
182+
google.golang.org/appengine v1.6.8 // indirect
162183
google.golang.org/genproto/googleapis/api v0.0.0-20240123012728-ef4313101c80 // indirect
184+
gopkg.in/inf.v0 v0.9.1 // indirect
163185
gopkg.in/ini.v1 v1.67.0 // indirect
164186
gopkg.in/yaml.v2 v2.4.0 // indirect
187+
k8s.io/klog/v2 v2.110.1 // indirect
188+
k8s.io/kube-openapi v0.0.0-20231010175941-2dd684a91f00 // indirect
165189
rsc.io/tmplfunc v0.0.3 // indirect
190+
sigs.k8s.io/json v0.0.0-20221116044647-bc3834ca7abd // indirect
191+
sigs.k8s.io/structured-merge-diff/v4 v4.4.1 // indirect
192+
sigs.k8s.io/yaml v1.3.0 // indirect
166193
)

0 commit comments

Comments
 (0)