From ea48d97dfe8dd80b630c5d45df52d281ca0f9452 Mon Sep 17 00:00:00 2001
From: zliang <zliang@snapchat.com>
Date: Fri, 22 Apr 2022 18:03:42 -0600
Subject: [PATCH] break into tests into steps

---
 build.yaml               | 32 +++++++++++++++++++++++++++++++-
 build_test.sh            | 21 ---------------------
 machamp_scripts/build.sh |  6 ++++++
 3 files changed, 37 insertions(+), 22 deletions(-)
 delete mode 100755 build_test.sh
 create mode 100644 machamp_scripts/build.sh

diff --git a/build.yaml b/build.yaml
index 49e163ca3..1e14b5ac7 100644
--- a/build.yaml
+++ b/build.yaml
@@ -15,4 +15,34 @@ machamp:
         type: cmd
         # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/build/ubuntu/ubuntu-20-04/keydb
         builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/build/keydb-ubuntu-20-04@sha256:c8e6ecf3c8b385509cc4e0521d7e28d6eef1f70dc7ca0a29f26ec02344870c42
-        command: ./build_test.sh
+        command: ./machamp_scripts/build.sh
+      tls-test:
+        type: cmd
+        parent: make-build
+        # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/build/ubuntu/ubuntu-20-04/keydb
+        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/build/keydb-ubuntu-20-04@sha256:c8e6ecf3c8b385509cc4e0521d7e28d6eef1f70dc7ca0a29f26ec02344870c42
+        command: ./runtest --clients 2 --verbose --tls
+      cluster-test:
+        type: cmd
+        parent: make-build
+        # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/build/ubuntu/ubuntu-20-04/keydb
+        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/build/keydb-ubuntu-20-04@sha256:c8e6ecf3c8b385509cc4e0521d7e28d6eef1f70dc7ca0a29f26ec02344870c42
+        command: ./runtest-cluster --tls
+      sentinel-test:
+        type: cmd
+        parent: make-build
+        # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/build/ubuntu/ubuntu-20-04/keydb
+        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/build/keydb-ubuntu-20-04@sha256:c8e6ecf3c8b385509cc4e0521d7e28d6eef1f70dc7ca0a29f26ec02344870c42
+        command: ./runtest-sentinel
+      module-test:
+        type: cmd
+        parent: make-build
+        # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/build/ubuntu/ubuntu-20-04/keydb
+        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/build/keydb-ubuntu-20-04@sha256:c8e6ecf3c8b385509cc4e0521d7e28d6eef1f70dc7ca0a29f26ec02344870c42
+        command: ./runtest-moduleapi
+      rotation-test:
+        type: cmd
+        parent: make-build
+        # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/build/ubuntu/ubuntu-20-04/keydb
+        builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/build/keydb-ubuntu-20-04@sha256:c8e6ecf3c8b385509cc4e0521d7e28d6eef1f70dc7ca0a29f26ec02344870c42
+        command: ./runtest-rotation
diff --git a/build_test.sh b/build_test.sh
deleted file mode 100755
index 9c7ccf9a7..000000000
--- a/build_test.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-# make the build
-git submodule init && git submodule update
-make BUILD_TLS=yes -j2 KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror'
-
-# gen-cert
-./utils/gen-test-certs.sh
-
-# test-tls
-./runtest --clients 2 --verbose --tls
-
-# cluster-test
-./runtest-cluster --tls
-
-# sentinel test
-./runtest-sentinel
-
-# module tests
-./runtest-moduleapi
-
-# rotation test
-./runtest-rotation
diff --git a/machamp_scripts/build.sh b/machamp_scripts/build.sh
new file mode 100644
index 000000000..0408c0db6
--- /dev/null
+++ b/machamp_scripts/build.sh
@@ -0,0 +1,6 @@
+# make the build
+git submodule init && git submodule update
+make BUILD_TLS=yes -j2 KEYDB_CFLAGS='-Werror' KEYDB_CXXFLAGS='-Werror'
+
+# gen-cert
+./utils/gen-test-certs.sh
\ No newline at end of file