File tree Expand file tree Collapse file tree 7 files changed +17
-8
lines changed
Expand file tree Collapse file tree 7 files changed +17
-8
lines changed Original file line number Diff line number Diff line change @@ -33,6 +33,7 @@ set -E # inherit -e
3333set -e # exit immediately on errors
3434set -u # exit on not assigned variables
3535set -o pipefail # exit on pipe failure
36+ set -x
3637
3738CLEAR=' \033[0m'
3839RED=' \033[0;31m'
@@ -1376,7 +1377,7 @@ function verify(){
13761377 ;;
13771378 --docker-repo )
13781379 __docker_repo=${2:? $error_message }
1379- shift 1 ;
1380+ shift 2 ;
13801381 ;;
13811382 --only-dockers )
13821383 __only_dockers=1
Original file line number Diff line number Diff line change @@ -76,7 +76,7 @@ let ReleaseSpec =
7676 , docker_publish = DockerPublish.Type. Essential
7777 , no_cache = False
7878 , no_debian = False
79- , docker_repo = DockerRepo.Type. Internal
79+ , docker_repo = DockerRepo.Type. InternalEurope
8080 , step_key_suffix = " -docker-image"
8181 , verify = False
8282 , deb_suffix = None Text
@@ -145,6 +145,7 @@ let generateStep =
145145 , profile = spec. deb_profile
146146 , buildFlag = spec. build_flags
147147 , archs = [ spec. arch ]
148+ , repo = spec. docker_repo
148149 }
149150
150151 else " "
Original file line number Diff line number Diff line change @@ -20,6 +20,8 @@ let BuildFlags = ../../Constants/BuildFlags.dhall
2020
2121let Profiles = ../../ Constants / Profiles. dhall
2222
23+ let DockerRepo = ../../ Constants / DockerRepo. dhall
24+
2325let Spec =
2426 { Type =
2527 { artifacts : List Artifact. Type
@@ -30,6 +32,7 @@ let Spec =
3032 , profile : Profiles. Type
3133 , archs : List Arch. Type
3234 , buildFlag : BuildFlags. Type
35+ , repo : DockerRepo. Type
3336 }
3437 , default =
3538 { artifacts = [] : List Package. Type
@@ -42,6 +45,7 @@ let Spec =
4245 , profile = Profiles.Type. Devnet
4346 , buildFlag = BuildFlags.Type. None
4447 , archs = [ Arch.Type. Amd64 ]
48+ , repo = DockerRepo.Type. InternalEurope
4549 }
4650 }
4751
@@ -108,6 +112,7 @@ let verify
108112 ++ " --networks ${joinNetworks spec} "
109113 ++ " --version ${spec.version} "
110114 ++ " --codenames ${joinCodenames spec} "
115+ ++ " --docker-repo ${DockerRepo.show spec.repo} "
111116 ++ profileFlag
112117 ++ archFlag
113118 ++ buildFlag
Original file line number Diff line number Diff line change @@ -50,7 +50,7 @@ let Spec =
5050 , timeout = 1000
5151 , profile = Profiles.Type. Devnet
5252 , scope = PipelineScope. Full
53- , repo = DockerRepo.Type. Internal
53+ , repo = DockerRepo.Type. InternalEurope
5454 , if_ =
5555 " build.pull_request.base_branch != \" develop\" && build.branch != \" develop\" "
5656 }
Original file line number Diff line number Diff line change @@ -16,7 +16,7 @@ in { executeLocal =
1616 , commands =
1717 [ Cmd. run
1818 " MINA_DEB_CODENAME=bullseye ; source ./buildkite/scripts/export-git-env-vars.sh && ./buildkite/scripts/run-test-executive-local.sh ${testName} ${DockerRepo.show
19- DockerRepo.Type.Internal }"
19+ DockerRepo.Type.InternalEurope }"
2020 ]
2121 , artifact_paths =
2222 [ SelectFiles. exactly " ." " ${testName}.local.test.log" ]
Original file line number Diff line number Diff line change @@ -223,8 +223,9 @@ let dockerTag =
223223
224224let fullDockerTag =
225225 \ (spec : Tag. Type )
226- -> " ${Repo.show Repo.Type.Internal}/${dockerName
227- spec.artifact}:${dockerTag spec}"
226+ -> " ${Repo.show Repo.Type.InternalEurope}/${dockerName
227+ spec.artifact}:${dockerTag
228+ spec}"
228229
229230in { Type = Artifact
230231 , Tag = Tag
Original file line number Diff line number Diff line change 11let Repo
22 : Type
3- = < Internal | Public >
3+ = < Internal | InternalEurope >
44
55let show =
66 \ (repo : Repo )
77 -> merge
88 { Internal = " gcr.io/o1labs-192920"
9- , Public = " docker.io/minaprotocol"
9+ , InternalEurope =
10+ " europe-west3-docker.pkg.dev/o1labs-192920/euro-docker-repo"
1011 }
1112 repo
1213
You can’t perform that action at this time.
0 commit comments