From b9a60e385956c16a16dbfc8a03eac2a53f2515ff Mon Sep 17 00:00:00 2001 From: Guohan Lu Date: Fri, 18 Nov 2022 01:04:25 -0800 Subject: [PATCH] modify github workflow to pull the docker image from acr automatically Signed-off-by: Guohan Lu --- .github/workflows/dash-bmv2-ci.yml | 6 +++--- .github/workflows/dash-saithrift-client-bldr-docker-acr.yml | 2 +- .github/workflows/dash-saithrift-client-bldr-docker.yml | 2 +- .github/workflows/dash-saithrift-client-docker.yml | 2 +- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/dash-bmv2-ci.yml b/.github/workflows/dash-bmv2-ci.yml index 4aabd09b8..fe4f3ed4e 100644 --- a/.github/workflows/dash-bmv2-ci.yml +++ b/.github/workflows/dash-bmv2-ci.yml @@ -49,17 +49,17 @@ jobs: steps: - uses: actions/checkout@v3 - name: Pull docker p4c image - run: make docker-pull-dash-p4c + run: make docker-dash-p4c - name: Build P4 software switch (bmv2) and P4Info run: DOCKER_FLAGS=$docker_fg_flags make p4 - name: Install SAI submodule run: git submodule update --init - name: Pull docker saithrift-bldr image - run: make docker-pull-saithrift-bldr + run: make docker-saithrift-bldr - name: Generate SAI API run: DOCKER_FLAGS=$docker_fg_flags make sai - name: Pull docker bmv2-bldr image - run: make docker-pull-bmv2-bldr + run: make docker-bmv2-bldr - name: Build libsai c++ tests run: DOCKER_FLAGS=$docker_fg_flags make test - name: Prepare network diff --git a/.github/workflows/dash-saithrift-client-bldr-docker-acr.yml b/.github/workflows/dash-saithrift-client-bldr-docker-acr.yml index eac589a5c..f589e1191 100644 --- a/.github/workflows/dash-saithrift-client-bldr-docker-acr.yml +++ b/.github/workflows/dash-saithrift-client-bldr-docker-acr.yml @@ -34,7 +34,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Pull docker p4c image - run: make docker-pull-dash-p4c + run: make docker-dash-p4c - name: Build P4 software switch (bmv2) and P4Info run: DOCKER_FLAGS=$docker_fg_flags make p4 - name: Install SAI submodule diff --git a/.github/workflows/dash-saithrift-client-bldr-docker.yml b/.github/workflows/dash-saithrift-client-bldr-docker.yml index 42a4cb6fa..c2a3fe60d 100644 --- a/.github/workflows/dash-saithrift-client-bldr-docker.yml +++ b/.github/workflows/dash-saithrift-client-bldr-docker.yml @@ -37,7 +37,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Pull docker p4c image - run: make docker-pull-dash-p4c + run: make docker-dash-p4c - name: Build P4 software switch (bmv2) and P4Info run: DOCKER_FLAGS=$docker_fg_flags make p4 - name: Install SAI submodule diff --git a/.github/workflows/dash-saithrift-client-docker.yml b/.github/workflows/dash-saithrift-client-docker.yml index 649615a89..2047b7e5a 100644 --- a/.github/workflows/dash-saithrift-client-docker.yml +++ b/.github/workflows/dash-saithrift-client-docker.yml @@ -32,7 +32,7 @@ jobs: steps: - uses: actions/checkout@v3 - name: Pull docker p4c image - run: make docker-pull-dash-p4c + run: make docker-dash-p4c - name: Build P4 software switch (bmv2) and P4Info run: DOCKER_FLAGS=$docker_fg_flags make p4 - name: Install SAI submodule