Merge remote-tracking branch 'origin/compatible' into replay_attacks_…

…test

buildkite/src/Command/Base.dhall

@@ -101,7 +101,7 @@ let Config =
       , retries : List Retry.Type
       , soft_fail : Optional B/SoftFail
       , skip: Optional B/Skip
-      , if : Optional B/If
+      , `if` : Optional B/If
       }
   , default =
     { depends_on = [] : List TaggedKey.Type
@@ -113,15 +113,16 @@ let Config =
     , retries = [] : List Retry.Type
     , soft_fail = None B/SoftFail
     , skip = None B/Skip
-    , if = None B/If
+    , `if` = None B/If
     }
   }
 
 let targetToAgent = \(target : Size) ->
   merge { XLarge = toMap { size = "generic" },
           Large = toMap { size = "generic" },
           Medium = toMap { size = "generic" },
-          Small = toMap { size = "generic" }
+          Small = toMap { size = "generic" },
+          Integration = toMap { size = "integration" }
         }
         target
 
@@ -193,7 +194,7 @@ let build : Config.Type -> B/Command.Type = \(c : Config.Type) ->
           },
     soft_fail = c.soft_fail,
     skip = c.skip,
-    if = c.if,
+    `if` = c.`if`,
     plugins =
       let dockerPart =
         Optional/toList

buildkite/src/Command/DockerImage.dhall

@@ -10,8 +10,6 @@ let Cmd = ../Lib/Cmds.dhall
 let DockerLogin = ../Command/DockerLogin/Type.dhall
 
 
-let defaultArtifactStep = { name = "GitEnvUpload", key = "upload-git-env", deploy_env_file = "export-git-env-vars.sh" }
-
 let ReleaseSpec = {
   Type = {
     deps : List Command.TaggedKey.Type,
@@ -44,11 +42,7 @@ let generateStep = \(spec : ReleaseSpec.Type) ->
     let commands : List Cmd.Type =
     [
         Cmd.run (
-          "[ ! -f ${defaultArtifactStep.deploy_env_file} ] && buildkite-agent artifact download --build \\\$BUILDKITE_BUILD_ID " ++
-              "--include-retried-jobs --step _${defaultArtifactStep.name}-${defaultArtifactStep.key} ${defaultArtifactStep.deploy_env_file} ."
-        ),
-        Cmd.run (
-          "export MINA_DEB_CODENAME=${spec.deb_codename} && source ${defaultArtifactStep.deploy_env_file} && ./scripts/release-docker.sh " ++
+          "export MINA_DEB_CODENAME=${spec.deb_codename} && source ./buildkite/scripts/export-git-env-vars.sh && ./scripts/release-docker.sh " ++
               "--service ${spec.service} --version ${spec.version} --network ${spec.network} --branch ${spec.branch} --deb-codename ${spec.deb_codename} --deb-release ${spec.deb_release} --deb-version ${spec.deb_version} --extra-args \\\"${spec.extra_args}\\\""
         )
     ]

buildkite/src/Command/MinaArtifact.dhall

@@ -97,7 +97,6 @@ let pipeline : DebianVersions.DebVersion -> Pipeline.Config.Type = \(debVersion
 
         -- rosetta image
         let rosettaSpec = DockerImage.ReleaseSpec::{
-          deps=DebianVersions.dependsOnGitEnv,
           service="mina-rosetta",
           extra_args="--build-arg MINA_BRANCH=\\\${BUILDKITE_BRANCH} --no-cache",
           deb_codename="${DebianVersions.lowerName debVersion}",

buildkite/src/Command/Size.dhall

@@ -1 +1 @@
-<XLarge|Large|Medium|Small>
+<XLarge|Large|Medium|Small|Integration>

buildkite/src/Command/TestExecutive.dhall

@@ -9,8 +9,6 @@ let RunInToolchain = ../Command/RunInToolchain.dhall
 let Cmd = ../Lib/Cmds.dhall
 let SelectFiles = ../Lib/SelectFiles.dhall
 
-let defaultArtifactStep = { name = "GitEnvUpload", key = "upload-git-env", deploy_env_file = "export-git-env-vars.sh" }
-
 in
 
 {
@@ -33,7 +31,7 @@ in
         label = "Build test-executive",
         key = "build-test-executive",
         target = Size.XLarge,
-        if = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'"
+        `if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'"
       },
 
   execute = \(testName : Text) -> \(dependsOn : List Command.TaggedKey.Type) ->
@@ -44,19 +42,15 @@ in
               -- Download test dependencies
               Cmd.run "artifact-cache-helper.sh test_executive.exe && chmod +x test_executive.exe",
               Cmd.run "artifact-cache-helper.sh logproc.exe && chmod +x logproc.exe",
-              Cmd.run (
-                  "[ ! -f ${defaultArtifactStep.deploy_env_file} ] && buildkite-agent artifact download --build \\\$BUILDKITE_BUILD_ID " ++
-                      "--include-retried-jobs --step _${defaultArtifactStep.name}-${defaultArtifactStep.key} ${defaultArtifactStep.deploy_env_file} ."
-              ),
 
               -- Execute test based on BUILD image
-              Cmd.run "MINA_DEB_CODENAME=buster ; source ${defaultArtifactStep.deploy_env_file} && ./buildkite/scripts/run-test-executive.sh ${testName}"
+              Cmd.run "MINA_DEB_CODENAME=buster ; source ./buildkite/scripts/export-git-env-vars.sh && ./buildkite/scripts/run-test-executive.sh ${testName}"
             ],
         artifact_paths = [SelectFiles.exactly "." "${testName}.test.log"],
         label = "${testName} integration test",
         key = "integration-test-${testName}",
-        target = Size.Medium,
+        target = Size.Integration,
         depends_on = dependsOn,
-        if = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'"
+        `if` = Some "build.branch != 'develop' && build.branch != 'compatible' && build.branch != 'develop-next'"
       }
 }

buildkite/src/Constants/DebianVersions.dhall

@@ -2,8 +2,6 @@ let Prelude = ../External/Prelude.dhall
 let RunInToolchain = ../Command/RunInToolchain.dhall
 let ContainerImages = ./ContainerImages.dhall
 
-let dependsOnGitEnv = [ { name = "GitEnvUpload", key = "upload-git-env" } ]
-
 let DebVersion = < Bullseye | Buster | Stretch | Focal | Bionic >
 
 let capitalName = \(debVersion : DebVersion) ->
@@ -46,11 +44,11 @@ let toolchainImage = \(debVersion : DebVersion) ->
 
 let dependsOn = \(debVersion : DebVersion) ->
   merge {
-    Bullseye = dependsOnGitEnv # [{ name = "MinaArtifactBullseye", key = "build-deb-pkg" }]
-    , Buster = dependsOnGitEnv # [{ name = "MinaArtifactBuster", key = "build-deb-pkg" }]
-    , Stretch = dependsOnGitEnv # [{ name = "MinaArtifactStretch", key = "build-deb-pkg" }]
-    , Bionic = dependsOnGitEnv # [{ name = "MinaArtifactBionic", key = "build-deb-pkg" }]
-    , Focal = dependsOnGitEnv # [{ name = "MinaArtifactFocal", key = "build-deb-pkg" }]
+    Bullseye = [{ name = "MinaArtifactBullseye", key = "build-deb-pkg" }]
+    , Buster = [{ name = "MinaArtifactBuster", key = "build-deb-pkg" }]
+    , Stretch = [{ name = "MinaArtifactStretch", key = "build-deb-pkg" }]
+    , Bionic = [{ name = "MinaArtifactBionic", key = "build-deb-pkg" }]
+    , Focal = [{ name = "MinaArtifactFocal", key = "build-deb-pkg" }]
   } debVersion
 
 in
@@ -62,5 +60,4 @@ in
   , toolchainRunner = toolchainRunner
   , toolchainImage = toolchainImage
   , dependsOn = dependsOn
-  , dependsOnGitEnv = dependsOnGitEnv
 }

buildkite/src/External/Buildkite.dhall

@@ -1 +1 @@
-https://raw.githubusercontent.com/bkase/jsonschema-to-dhall/88299aa6e021ec85e2661bea5cfdc4483aa62b4b/out/top_level/Type sha256:8d6a62cc593cf00025e7db7b2ce52398ba073c385522879c5d2047f7686b3499
+https://raw.githubusercontent.com/bkase/jsonschema-to-dhall/cc6c14b615b42f35157db29077530223638dbfd9/out/top_level/Type sha256:8d6a62cc593cf00025e7db7b2ce52398ba073c385522879c5d2047f7686b3499

buildkite/src/Jobs/Release/BotArtifact.dhall

@@ -11,10 +11,7 @@ let Command = ../../Command/Base.dhall
 let Size = ../../Command/Size.dhall
 let DockerImage = ../../Command/DockerImage.dhall
 
-let dependsOn = [ { name = "GitEnvUpload", key = "upload-git-env" } ]
-
 let spec = DockerImage.ReleaseSpec::{
-    deps=dependsOn,
     service="bot",
     step_key="bot-docker-image"
 }

buildkite/src/Jobs/Release/LeaderboardArtifact.dhall

@@ -11,10 +11,7 @@ let Command = ../../Command/Base.dhall
 let Size = ../../Command/Size.dhall
 let DockerImage = ../../Command/DockerImage.dhall
 
-let dependsOn = [ { name = "GitEnvUpload", key = "upload-git-env" } ]
-
 let spec = DockerImage.ReleaseSpec::{
-    deps=dependsOn,
     service="leaderboard",
     step_key="leaderboard-docker-image"
 }

buildkite/src/Jobs/Release/MinaToolchainArtifact.dhall

@@ -12,9 +12,6 @@ let DockerImage = ../../Command/DockerImage.dhall
 let DockerLogin = ../../Command/DockerLogin/Type.dhall
 
 
-let dependsOn = [ { name = "GitEnvUpload", key = "upload-git-env" } ]
-let deployEnv = "export-git-env-vars.sh"
-
 in
 
 Pipeline.build
@@ -35,7 +32,6 @@ Pipeline.build
 
       -- mina-toolchain Debian 11 "Bullseye" Toolchain
       let toolchainBullseyeSpec = DockerImage.ReleaseSpec::{
-        deps=dependsOn,
         service="mina-toolchain",
         deb_codename="bullseye",
         extra_args="--no-cache",
@@ -48,7 +44,6 @@ Pipeline.build
 
       -- mina-toolchain Debian 10 "Buster" Toolchain
       let toolchainBusterSpec = DockerImage.ReleaseSpec::{
-        deps=dependsOn,
         service="mina-toolchain",
         deb_codename="buster",
         extra_args="--no-cache",
@@ -61,7 +56,6 @@ Pipeline.build
 
       -- mina-toolchain Debian 9 "Stretch" Toolchain
       let toolchainStretchSpec = DockerImage.ReleaseSpec::{
-        deps=dependsOn,
         service="mina-toolchain",
         deb_codename="stretch",
         extra_args="--no-cache",
@@ -74,7 +68,6 @@ Pipeline.build
 
       -- mina-toolchain Ubuntu 20.04 "Focal Fossa" Toolchain
       let toolchainFocalSpec = DockerImage.ReleaseSpec::{
-        deps=dependsOn,
         service="mina-toolchain",
         deb_codename="focal",
         extra_args="--no-cache",