From 268d90079a27fd88e9eb566d8b7f472e3aea5bde Mon Sep 17 00:00:00 2001 From: Rafael Peria de Sene Date: Wed, 13 Jan 2021 11:02:35 -0300 Subject: [PATCH] Update Travis build to push the multiarch images to a new Quay.io repo Signed-off-by: Rafael Peria de Sene --- .travis.yml | 10 +++++----- scripts/multi-arch.sh | 6 +++--- yamls/ocp-cluster.yaml | 2 +- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/.travis.yml b/.travis.yml index 750e47d..d95b4d8 100644 --- a/.travis.yml +++ b/.travis.yml @@ -14,18 +14,18 @@ jobs: - cd ./dockerfile - cp ../scripts/deploy-ocp-cluster.sh ./ - sed -i -e "s/VERSION/$VERSION/g" ./Dockerfile - - docker build -t quay.io/powercloud/ocp4-powervs-automation-runtime:ocp-$VERSION-$(uname -m) . + - docker build -t quay.io/powercloud/ocp-upi-powervs-pod:ocp-$VERSION-$(uname -m) . - docker login quay.io -u $USER_QUAY -p $PWD_QUAY - - docker push quay.io/powercloud/ocp4-powervs-automation-runtime:ocp-$VERSION-$(uname -m) + - docker push quay.io/powercloud/ocp-upi-powervs-pod:ocp-$VERSION-$(uname -m) - stage: building x86_64 container image arch: amd64 script: - cd ./dockerfile - cp ../scripts/deploy-ocp-cluster.sh ./ - sed -i -e "s/VERSION/$VERSION/g" ./Dockerfile - - docker build -t quay.io/powercloud/ocp4-powervs-automation-runtime:ocp-$VERSION-$(uname -m) . + - docker build -t quay.io/powercloud/ocp-upi-powervs-pod:ocp-$VERSION-$(uname -m) . - docker login quay.io -u $USER_QUAY -p $PWD_QUAY - - docker push quay.io/powercloud/ocp4-powervs-automation-runtime:ocp-$VERSION-$(uname -m) + - docker push quay.io/powercloud/ocp-upi-powervs-pod:ocp-$VERSION-$(uname -m) - stage: building multi-arch container image arch: ppc64le - script: chmod +x ./scripts/multi-arch.sh; ./scripts/multi-arch.sh $VERSION \ No newline at end of file + script: chmod +x ./scripts/multi-arch.sh; ./scripts/multi-arch.sh $VERSION diff --git a/scripts/multi-arch.sh b/scripts/multi-arch.sh index 2895f54..20a95cb 100755 --- a/scripts/multi-arch.sh +++ b/scripts/multi-arch.sh @@ -11,9 +11,9 @@ OCP_VERSION=ocp-$1 export DOCKER_CLI_EXPERIMENTAL=enabled -docker manifest create quay.io/powercloud/ocp4-powervs-automation-runtime:$OCP_VERSION \ -quay.io/powercloud/ocp4-powervs-automation-runtime:ocp-$VERSION-x86_64 quay.io/powercloud/ocp4-powervs-automation-runtime:ocp-$VERSION-ppc64le +docker manifest create quay.io/powercloud/ocp-upi-powervs-pod:$OCP_VERSION \ +quay.io/powercloud/ocp-upi-powervs-pod:ocp-$VERSION-x86_64 quay.io/powercloud/ocp-upi-powervs-pod:ocp-$VERSION-ppc64le docker login quay.io -u $USER_QUAY -p $PWD_QUAY -docker manifest push quay.io/powercloud/ocp4-powervs-automation-runtime:$OCP_VERSION +docker manifest push quay.io/powercloud/ocp-upi-powervs-pod:$OCP_VERSION diff --git a/yamls/ocp-cluster.yaml b/yamls/ocp-cluster.yaml index 40ffe3e..c64409a 100644 --- a/yamls/ocp-cluster.yaml +++ b/yamls/ocp-cluster.yaml @@ -8,7 +8,7 @@ spec: restartPolicy: Never containers: - name: ocp-cluster-CLUSTERID - image: quay.io/powercloud/ocp4-powervs-automation-runtime:ocp-VERSION + image: quay.io/powercloud/ocp-upi-powervs-pod:ocp-VERSION imagePullPolicy: Always volumeMounts: - name: nfs-pvc