From: Cédric Ollivier Date: Thu, 12 May 2022 12:23:58 +0000 (+0200) Subject: Fix multiarch builder X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=commitdiff_plain;h=417764008356a13b0a4690875a13ce546a7f46e6;p=releng.git Fix multiarch builder Change-Id: Id15eeb660ea3427680ccd335ac510a18d4a0212b Signed-off-by: Cédric Ollivier --- diff --git a/jjb/functest/xtesting-ci-docker.yaml b/jjb/functest/xtesting-ci-docker.yaml index 9d827eff3..f77893541 100644 --- a/jjb/functest/xtesting-ci-docker.yaml +++ b/jjb/functest/xtesting-ci-docker.yaml @@ -18,17 +18,17 @@ sudo -E make && sudo -E make install) (cd {dir} && \ sudo docker build --pull -t {image}:amd64-{tag} . && \ - sudo docker push {image}) + sudo docker push {image}:{tag}) (cd {dir} && \ git checkout Dockerfile sed -i -e "s|{from_amd64}|{to_arm64}|g" Dockerfile sudo docker build --pull -t {image}:arm64-{tag} . && \ - sudo docker push {image}) + sudo docker push {image}:{tag}) (cd {dir} && \ git checkout Dockerfile sed -i -e "s|{from_amd64}|{to_arm}|g" Dockerfile sudo docker build --pull -t {image}:arm-{tag} . && \ - sudo docker push {image}-{tag}) + sudo docker push {image}:{tag}) sudo manifest-tool push from-args \ --platforms linux/amd64,linux/arm,linux/arm64 \ --template {image}:ARCH-{tag} \