Merge master into devnet2

.buildkite/benchmarking.pipeline.yml

@@ -8,7 +8,6 @@ docker_plugin: &docker_plugin_configuration
     workdir: /workdir
     volumes:
       - .:/workdir
-      - /var/lib/buildkite-agent/.ssh:/root/.ssh
       - /var/lib/buildkite-agent/.coveralls:/root/.coveralls
       - /var/lib/buildkite-agent/.buildkite:/root/.buildkite
       # Shared Rust target artifacts cache.
@@ -24,16 +23,14 @@ docker_plugin: &docker_plugin_configuration
       - "CARGO_TARGET_DIR=/workdir/target"
       - "CARGO_INSTALL_ROOT=/root/.cargo"
       - "RUSTFLAGS=-C target-feature=+aes,+ssse3"
+      - "GOPROXY=https://proxy.golang.org/"
     propagate-environment: true
     unconfined: true
 
 steps:
   - label: Build artifacts
-    branches: master devnet2
+    branches: master
     command:
-      - .buildkite/scripts/setup_gitconfig.sh
-      - eval $(ssh-agent -s)
-      - ssh-add
       - .buildkite/scripts/build_benchmarking_context.sh context.tar.gz
     artifact_paths:
       - context.tar.gz
@@ -44,19 +41,13 @@ steps:
 
   - wait
 
-  - label: Update benchmarking docker image tags (master branches only)
-    branches: master
-    command:
-      - .buildkite/scripts/build_tag_push_benchmark_image.sh context.tar.gz latest-benchmarking benchmarking-latest
-
-  - wait
-
-  - label: "Trigger benchmark run (master branches only)"
+  - label: ":rocket: Publish benchmarking docker image"
+    trigger: private-ops-oasis-runtime-benchmarking-publish-image
+    async: true
     branches: master
-    trigger: private-ops-run-benchmarks
     build:
       message: "${BUILDKITE_MESSAGE}"
-      commit: HEAD
-      branch: master
       env:
-        BENCHMARK_IMAGE: oasislabs/ekiden-runtime-ethereum:benchmarking-latest
+        OASIS_RUNTIME_JOB_ID: "${BUILDKITE_JOB_ID}"
+        OASIS_RUNTIME_COMMIT: "${BUILDKITE_COMMIT}"
+        OASIS_RUNTIME_BRANCH: "${BUILDKITE_BRANCH}"

.buildkite/daily.pipeline.yml

@@ -6,18 +6,9 @@
 # to other pipelines that will be triggered daily.
 
 steps:
-  - label: "Trigger e2e tests"
+  - label: Trigger benchmark build
     branches: master
-    trigger: runtime-ethereum-e2e-tests
-    async: true
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: HEAD
-      branch: "${BUILDKITE_BRANCH}"
-
-  - label: "Trigger benchmark run"
-    branches: master
-    trigger: runtime-ethereum-benchmarks
+    trigger: oasis-runtime-benchmarks-build-image-context
     async: true
     build:
       message: "${BUILDKITE_MESSAGE}"

.buildkite/deploy.pipeline.yml

@@ -8,7 +8,6 @@ docker_plugin: &docker_plugin_configuration
     workdir: /workdir
     volumes:
       - .:/workdir
-      - /var/lib/buildkite-agent/.ssh:/root/.ssh
       # Shared Rust incremental compile caches.
       - /tmp/cargo_ic/release:/workdir/target/release/incremental
       - /tmp/cargo_ic/release_sgx:/workdir/target/x86_64-fortanix-unknown-sgx/release/incremental
@@ -28,14 +27,14 @@ docker_plugin: &docker_plugin_configuration
     propagate-environment: true
 
 steps:
-  - label: Extract platform resources (master branches only)
+  - label: Extract platform resources
     branches: master
     command:
       - .buildkite/scripts/extract_platform_resources.sh platform
     artifact_paths:
       - platform/*
 
-  - label: Extract platform resources (devnet2 branch only)
+  - label: Extract platform resources
     branches: devnet2
     command:
       - .buildkite/scripts/extract_platform_resources.sh platform
@@ -44,14 +43,14 @@ steps:
     env:
       BASE_VARIANT: devnet2
 
-  - label: Extract production-track platform resources (master branches only)
+  - label: Extract production-track platform resources
     branches: master
     command:
       - .buildkite/scripts/extract_platform_resources.sh platform-prod
     artifact_paths:
       - platform-prod/*
 
-  - label: Extract production-track platform resources (devnet2 branch only)
+  - label: Extract production-track platform resources
     branches: devnet2
     command:
       - .buildkite/scripts/extract_platform_resources.sh platform-prod latest-devnet2
@@ -61,14 +60,12 @@ steps:
   - wait
 
   - label: Get docker tag and save it as metadata for use later
+    branches: master
     command: .buildkite/scripts/set_docker_tag_meta_data.sh
 
-  - label: Build artifacts
+  - label: Build testing artifacts
     branches: master devnet2
     command:
-      - .buildkite/scripts/setup_gitconfig.sh
-      - eval $(ssh-agent -s)
-      - ssh-add
       - .buildkite/scripts/build_deployment_context.sh platform context.tar.gz
     artifact_paths:
       - context.tar.gz
@@ -80,9 +77,6 @@ steps:
   - label: Build benchmarking artifacts
     branches: master devnet2
     command:
-      - .buildkite/scripts/setup_gitconfig.sh
-      - eval $(ssh-agent -s)
-      - ssh-add
       - .buildkite/scripts/build_deployment_context.sh platform context-bench.tar.gz
     env:
       BUILD_BENCHMARKING: "1"
@@ -96,9 +90,6 @@ steps:
   - label: Build production-track artifacts
     branches: master devnet2
     command:
-      - .buildkite/scripts/setup_gitconfig.sh
-      - eval $(ssh-agent -s)
-      - ssh-add
       - .buildkite/scripts/build_deployment_context.sh platform-prod context-prod.tar.gz
     env:
       BUILD_PRODUCTION_GENESIS: "1"
@@ -111,84 +102,25 @@ steps:
 
   - wait
 
-  - label: Update testing docker image tags (master branches only)
-    branches: master
-    command:
-      - .buildkite/scripts/build_tag_push_deployment_image.sh context.tar.gz
-      - .buildkite/scripts/promote_deployment_image_to.sh latest-testing
-    env:
-      BASE_VARIANT: testing
-      DEPLOYMENT_VARIANT: testing
-
-  - label: Update testing docker image tags (devnet2 branch only)
-    branches: devnet2
-    command:
-      - .buildkite/scripts/build_tag_push_deployment_image.sh context.tar.gz
-      - .buildkite/scripts/promote_deployment_image_to.sh latest-testing-devnet2
-    env:
-      BASE_VARIANT: testing
-      DEPLOYMENT_VARIANT: testing
-
-  - label: Update benchmarking docker image tags (master branches only)
-    branches: master
-    command:
-      - .buildkite/scripts/build_tag_push_deployment_image.sh context-bench.tar.gz
-      - .buildkite/scripts/promote_deployment_image_to.sh latest-benchmarking
-    env:
-      BASE_VARIANT: testing
-      DEPLOYMENT_VARIANT: benchmarking
-
-  - label: Update staging docker image tags (master branches only)
-    branches: master
-    command:
-      - .buildkite/scripts/build_tag_push_deployment_image.sh context-prod.tar.gz
-      - .buildkite/scripts/promote_deployment_image_to.sh staging
-
-  - label: Update staging devnet2 docker image tags (devnet2 branch only)
-    branches: devnet2
-    command:
-      - .buildkite/scripts/build_tag_push_deployment_image.sh context-prod.tar.gz
-      - .buildkite/scripts/promote_deployment_image_to.sh staging-devnet2
-    env:
-      BASE_VARIANT: devnet2
-      DEPLOYMENT_VARIANT: devnet2
-
-  - wait
-
-  - label: "Trigger staging deployment (master branches only)"
-    trigger: private-ops-deploy-ekiden-staging
+  - label: ":rocket: Publish docker images"
+    trigger: private-ops-oasis-runtime-publish-image
+    async: true
     branches: master
     build:
       message: "${BUILDKITE_MESSAGE}"
-      commit: HEAD
-      branch: master
-
-  - label: "Trigger staging devnet2 deployment (devnet2 branch only)"
-    trigger: private-ops-deploy-ekiden-devnet2-staging
+      env:
+        OASIS_RUNTIME_JOB_ID: "${BUILDKITE_JOB_ID}"
+        OASIS_RUNTIME_COMMIT: "${BUILDKITE_COMMIT}"
+        OASIS_RUNTIME_BRANCH: "${BUILDKITE_BRANCH}"
+
+  - label: ":rocket: Publish docker images"
+    trigger: private-ops-oasis-runtime-publish-image
+    async: true
     branches: devnet2
     build:
       message: "${BUILDKITE_MESSAGE}"
-      commit: HEAD
-      branch: master
-
-  - label: "Trigger hardware staging deployment (master branches only)"
-    trigger: private-ops-deploy-ekiden-hardware-staging
-    branches: master
-    build:
-      message: "${BUILDKITE_MESSAGE}"
-      commit: HEAD
-      branch: master
-
-  - label: "Build and push all-in-one image (master branches only)"
-    branches: master
-    command:
-      - ./docker/all-in-one/build.sh
-      - docker tag local-aio:latest oasislabs/private-all-in-one:latest
-      - docker push oasislabs/private-all-in-one:latest
-
-  - label: "Build and push all-in-one image (devnet2 branch only)"
-    branches: devnet2
-    command:
-      - ./docker/all-in-one/build.sh
-      - docker tag local-aio:latest oasislabs/private-all-in-one:latest-devnet2
-      - docker push oasislabs/private-all-in-one:latest-devnet2
+      env:
+        OASIS_RUNTIME_JOB_ID: "${BUILDKITE_JOB_ID}"
+        OASIS_RUNTIME_COMMIT: "${BUILDKITE_COMMIT}"
+        OASIS_RUNTIME_BRANCH: "${BUILDKITE_BRANCH}"
+        IMAGE_VARIANT: devnet2