Skip to content

Commit 422b8a0

Browse files
SanabriaRussoSanabriaRusso
authored
Merge branch 'develop' into pod-probes
2 parents fca34f6 + be5b2d8 commit 422b8a0

File tree

132 files changed

+2158
-1556
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

132 files changed

+2158
-1556
lines changed

‎buildkite/scripts/debian/promote.sh

-87
This file was deleted.

‎buildkite/scripts/download-artifact-from-cache.sh

-1
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
11
#!/bin/bash
22

33
set -eou pipefail
4-
set -x
54

65
if [[ $# -lt 2 ]]; then
76
echo "Usage: download-artifact-from-cache.sh <remote-folder> <file or regexp> [gsutil opts]"

‎buildkite/scripts/run-test-executive-cloud.sh

-27
This file was deleted.

‎buildkite/scripts/terraform-test.sh

-23
This file was deleted.

‎buildkite/scripts/version-linter-patch-missing-type-shapes.sh

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,13 +34,13 @@ function checkout_and_dump() {
3434
source buildkite/scripts/gsutil-upload.sh /tmp/${TYPE_SHAPE_FILE} gs://mina-type-shapes
3535
}
3636

37-
if ! $(gsutil ls gs://mina-type-shapes/$RELEASE_BRANCH_COMMIT 2>/dev/null); then
37+
if ! gsutil ls "gs://mina-type-shapes/${RELEASE_BRANCH_COMMIT}*" >/dev/null; then
3838
checkout_and_dump $RELEASE_BRANCH_COMMIT
3939
fi
4040

4141
if [[ -n "${BUILDKITE_PULL_REQUEST_BASE_BRANCH:-}" ]]; then
4242
BUILDKITE_PULL_REQUEST_BASE_BRANCH_COMMIT=$(git log -n 1 --format="%h" --abbrev=7 ${REMOTE}/${BUILDKITE_PULL_REQUEST_BASE_BRANCH} )
43-
if ! $(gsutil ls gs://mina-type-shapes/$BUILDKITE_PULL_REQUEST_BASE_BRANCH_COMMIT 2>/dev/null); then
43+
if ! gsutil ls "gs://mina-type-shapes/${BUILDKITE_PULL_REQUEST_BASE_BRANCH_COMMIT}*"; then
4444
checkout_and_dump $BUILDKITE_PULL_REQUEST_BASE_BRANCH_COMMIT
4545
fi
4646
fi

‎buildkite/src/Command/DockerImage.dhall

+22-10
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ let Network = ../Constants/Network.dhall
2424

2525
let Artifacts = ../Constants/Artifacts.dhall
2626

27+
let DockerPublish = ../Constants/DockerPublish.dhall
28+
2729
let ReleaseSpec =
2830
{ Type =
2931
{ deps : List Command.TaggedKey.Type
@@ -40,6 +42,7 @@ let ReleaseSpec =
4042
, deb_repo : DebianRepo.Type
4143
, build_flags : BuildFlags.Type
4244
, step_key_suffix : Text
45+
, docker_publish : DockerPublish.Type
4346
, if : Optional B/If
4447
}
4548
, default =
@@ -54,6 +57,7 @@ let ReleaseSpec =
5457
, deb_version = "\\\${MINA_DEB_VERSION}"
5558
, deb_profile = Profiles.Type.Standard
5659
, build_flags = BuildFlags.Type.None
60+
, docker_publish = DockerPublish.Type.Essential
5761
, deb_repo = DebianRepo.Type.PackagesO1Test
5862
, no_cache = False
5963
, step_key_suffix = "-docker-image"
@@ -102,16 +106,24 @@ let generateStep =
102106
++ " --repo ${spec.repo}"
103107

104108
let releaseDockerCmd =
105-
"./scripts/docker/release.sh"
106-
++ " --service ${Artifacts.dockerName spec.service}"
107-
++ " --version ${spec.version}"
108-
++ " --network ${spec.network}"
109-
++ " --deb-codename ${DebianVersions.lowerName
110-
spec.deb_codename}"
111-
++ " --deb-version ${spec.deb_version}"
112-
++ " --deb-profile ${Profiles.lowerName spec.deb_profile}"
113-
++ " --deb-build-flags ${BuildFlags.lowerName
114-
spec.build_flags}"
109+
if DockerPublish.shouldPublish
110+
spec.docker_publish
111+
spec.service
112+
113+
then "./scripts/docker/release.sh"
114+
++ " --service ${Artifacts.dockerName spec.service}"
115+
++ " --version ${spec.version}"
116+
++ " --network ${spec.network}"
117+
++ " --deb-codename ${DebianVersions.lowerName
118+
spec.deb_codename}"
119+
++ " --deb-version ${spec.deb_version}"
120+
++ " --deb-profile ${Profiles.lowerName
121+
spec.deb_profile}"
122+
++ " --deb-build-flags ${BuildFlags.lowerName
123+
spec.build_flags}"
124+
125+
else " echo In order to ensure storage optimization, skipping publishing docker as this is not essential one or publishing is disabled . Docker publish setting is set to ${DockerPublish.show
126+
spec.docker_publish}."
115127

116128
let remoteRepoCmds =
117129
[ Cmd.run

‎buildkite/src/Command/MinaArtifact.dhall

+11-22
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,8 @@ let DebianVersions = ../Constants/DebianVersions.dhall
2222

2323
let DebianRepo = ../Constants/DebianRepo.dhall
2424

25+
let DockerPublish = ../Constants/DockerPublish.dhall
26+
2527
let DebianChannel = ../Constants/DebianChannel.dhall
2628

2729
let Profiles = ../Constants/Profiles.dhall
@@ -170,6 +172,8 @@ let docker_step
170172
spec.buildFlags
171173
step_dep_name
172174

175+
let docker_publish = DockerPublish.Type.Essential
176+
173177
in merge
174178
{ Daemon =
175179
[ DockerImage.ReleaseSpec::{
@@ -179,33 +183,12 @@ let docker_step
179183
, deb_codename = spec.debVersion
180184
, deb_profile = spec.profile
181185
, build_flags = spec.buildFlags
186+
, docker_publish = docker_publish
182187
, deb_repo = DebianRepo.Type.Local
183188
}
184189
]
185190
, TestExecutive = [] : List DockerImage.ReleaseSpec.Type
186191
, LogProc = [] : List DockerImage.ReleaseSpec.Type
187-
, Toolchain =
188-
[ DockerImage.ReleaseSpec::{
189-
, service = Artifacts.Type.Toolchain
190-
, network = Network.lowerName Network.Type.Devnet
191-
, deb_codename = spec.debVersion
192-
, deb_profile = spec.profile
193-
, build_flags = spec.buildFlags
194-
, deb_repo = DebianRepo.Type.Local
195-
}
196-
]
197-
, ItnOrchestrator =
198-
[ DockerImage.ReleaseSpec::{
199-
, service = Artifacts.Type.ItnOrchestrator
200-
, network = Network.lowerName Network.Type.Devnet
201-
, deb_repo = DebianRepo.Type.Local
202-
}
203-
]
204-
, Leaderboard =
205-
[ DockerImage.ReleaseSpec::{
206-
, service = Artifacts.Type.Leaderboard
207-
}
208-
]
209192
, BatchTxn =
210193
[ DockerImage.ReleaseSpec::{
211194
, deps = deps
@@ -214,6 +197,7 @@ let docker_step
214197
, deb_codename = spec.debVersion
215198
, deb_profile = spec.profile
216199
, build_flags = spec.buildFlags
200+
, docker_publish = docker_publish
217201
, deb_repo = DebianRepo.Type.Local
218202
}
219203
]
@@ -224,6 +208,7 @@ let docker_step
224208
, deb_codename = spec.debVersion
225209
, deb_profile = spec.profile
226210
, build_flags = spec.buildFlags
211+
, docker_publish = docker_publish
227212
, deb_repo = DebianRepo.Type.Local
228213
}
229214
]
@@ -234,6 +219,7 @@ let docker_step
234219
, network = Network.lowerName spec.network
235220
, deb_codename = spec.debVersion
236221
, deb_profile = spec.profile
222+
, docker_publish = docker_publish
237223
, deb_repo = DebianRepo.Type.Local
238224
}
239225
]
@@ -242,6 +228,7 @@ let docker_step
242228
, deps = deps
243229
, service = Artifacts.Type.ZkappTestTransaction
244230
, build_flags = spec.buildFlags
231+
, docker_publish = docker_publish
245232
, deb_repo = DebianRepo.Type.Local
246233
, deb_profile = spec.profile
247234
, deb_codename = spec.debVersion
@@ -254,10 +241,12 @@ let docker_step
254241
, network = Network.lowerName Network.Type.Devnet
255242
, deb_codename = spec.debVersion
256243
, build_flags = spec.buildFlags
244+
, docker_publish = docker_publish
257245
, deb_repo = DebianRepo.Type.Local
258246
, deb_profile = spec.profile
259247
}
260248
]
249+
, Toolchain = [] : List DockerImage.ReleaseSpec.Type
261250
}
262251
artifact
263252

‎buildkite/src/Command/Promotion/PromoteDebian.dhall

+8-6
Original file line numberDiff line numberDiff line change
@@ -82,12 +82,14 @@ let promoteDebianStep =
8282
, "AWS_SECRET_ACCESS_KEY"
8383
, "FROM_VERSION_MANUAL"
8484
]
85-
". ./buildkite/scripts/export-git-env-vars.sh && ./buildkite/scripts/debian/promote.sh --repo ${DebianRepo.bucket_or_default
86-
spec.source_repo} --new-repo ${DebianRepo.bucket_or_default
87-
spec.target_repo} --package ${package_name} --version ${spec.version} --new-version ${spec.new_version} --architecture ${spec.architecture} --codename ${DebianVersions.lowerName
88-
spec.codename} --from-component ${DebianChannel.lowerName
89-
spec.from_channel} --to-component ${DebianChannel.lowerName
90-
spec.to_channel} ${new_name}"
85+
". ./buildkite/scripts/export-git-env-vars.sh && ./scripts/debian/reversion.sh --repo ${DebianRepo.bucket_or_default
86+
spec.source_repo} --new-repo ${DebianRepo.bucket_or_default
87+
spec.target_repo} --deb ${package_name} --version ${spec.version} --new-version ${spec.new_version} --codename ${DebianVersions.lowerName
88+
spec.codename} --suite ${DebianChannel.lowerName
89+
spec.from_channel} --new-suite ${DebianChannel.lowerName
90+
spec.to_channel} --release ${DebianChannel.lowerName
91+
spec.from_channel} --new-release ${DebianChannel.lowerName
92+
spec.to_channel} ${new_name}"
9193
, label = "Debian: ${spec.step_key}"
9294
, key = spec.step_key
9395
, target = Size.Small

‎buildkite/src/Command/Promotion/PromoteDocker.dhall

+2-2
Original file line numberDiff line numberDiff line change
@@ -77,8 +77,8 @@ let promoteDockerStep =
7777
spec.remove_profile_from_name
7878

7979
in Cmd.run
80-
". ./buildkite/scripts/export-git-env-vars.sh && ./buildkite/scripts/promote-docker.sh --name ${Artifact.dockerName
81-
spec.name} --version ${old_tag} --tag ${new_tag} ${publish}"
80+
". ./buildkite/scripts/export-git-env-vars.sh && ./scripts/docker/promote.sh --name ${Artifact.dockerName
81+
spec.name} --version ${old_tag} --tag ${new_tag} ${publish}"
8282
)
8383
spec.new_tags
8484

0 commit comments

Comments
 (0)