From 7b18695ead0128431eb23bbd5ba64cc543436c1b Mon Sep 17 00:00:00 2001 From: zliang Date: Mon, 25 Apr 2022 14:49:14 -0600 Subject: [PATCH] support multi arch build and tests --- build.yaml | 26 +++++++++++++------------- ci.yaml | 2 ++ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/build.yaml b/build.yaml index 1e14b5ac7..a291219fa 100644 --- a/build.yaml +++ b/build.yaml @@ -13,36 +13,36 @@ machamp: steps: make-build: 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 + # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-latest + builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-latest@sha256:abb764c7c19a6b5ffa24db1568b6ab40b16fe1326bff6154f05f774cea990700 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 + # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-latest + builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-latest@sha256:abb764c7c19a6b5ffa24db1568b6ab40b16fe1326bff6154f05f774cea990700 + command: ./runtest --clients $(nproc) --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 + # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-latest + builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-latest@sha256:abb764c7c19a6b5ffa24db1568b6ab40b16fe1326bff6154f05f774cea990700 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 + # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-latest + builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-latest@sha256:abb764c7c19a6b5ffa24db1568b6ab40b16fe1326bff6154f05f774cea990700 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 + # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-latest + builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-latest@sha256:abb764c7c19a6b5ffa24db1568b6ab40b16fe1326bff6154f05f774cea990700 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 + # Dockerfile for the builder img is in https://github.sc-corp.net/Snapchat/img/tree/master/keydb/ubuntu-latest + builder_image: us.gcr.io/snapchat-build-artifacts/prod/snapchat/img/keydb/keydb-ubuntu-latest@sha256:abb764c7c19a6b5ffa24db1568b6ab40b16fe1326bff6154f05f774cea990700 command: ./runtest-rotation diff --git a/ci.yaml b/ci.yaml index 26b36c06f..5614be8e6 100644 --- a/ci.yaml +++ b/ci.yaml @@ -7,8 +7,10 @@ on: - workflow_type: backend_workflow # references a build defined in build.yaml build_name: keydb-build + arch_types: ["amd64", "arm64"] push: - branches: [master] workflows: - workflow_type: backend_workflow build_name: keydb-build + arch_types: ["amd64", "arm64"]