1
0

Updated to latest xe-solutions

Signed-off-by: James Ketrenos <james.p.ketrenos@intel.com>
This commit is contained in:
James Ketrenos 2020-11-01 22:02:16 -08:00
parent c1a0eb12e3
commit 4496a72e89
4 changed files with 25 additions and 13 deletions

View File

@ -110,7 +110,7 @@ while (( iter )); do
if docker push ${REGISTRY_URL}/${CONTAINER}:latest-${TARGET_TAG}; then if docker push ${REGISTRY_URL}/${CONTAINER}:latest-${TARGET_TAG}; then
break break
fi fi
fail "Unable to push ${CONTAINER}:latest-${TARGET_TAG}" echo "Unable to push ${CONTAINER}:latest-${TARGET_TAG}"
iter=$((iter-1)) iter=$((iter-1))
if (( ! iter )); then if (( ! iter )); then
fail "No more tries." fail "No more tries."

View File

@ -16,12 +16,24 @@ RELEASE_INFO=${RELEASE_INFO:-N/A}
TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}} TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
} }
docker tag ${CONTAINER}:${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG} \ if ! docker tag ${CONTAINER}:${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG}; then
&& docker push ${REGISTRY_URL}/${CONTAINER}:${TAG} \ fail "Unable to tag .../${CONTAINER}:${TAG}"
|| { fi
echo "Unable to tag and push image to ${REGISTRY_URL}."
exit 1 iter=5
} while (( iter )); do
echo "Pushing as .../${CONTAINER}:${TAG}"
if docker push ${REGISTRY_URL}/${CONTAINER}:${TAG}; then
break
fi
echo "Unable to tag and push image to ${REGISTRY_URL}."
iter=$((iter-1))
if (( ! iter )); then
fail "No more tries."
fi
echo "Waiting 10s before trying again..."
sleep 10
done
[[ "${TAG}" =~ "test-*" ]] && { [[ "${TAG}" =~ "test-*" ]] && {
cat << EOM cat << EOM

View File

@ -67,8 +67,8 @@ CURL=$(which curl)
# The following constants are used so we can run trigger.sh # The following constants are used so we can run trigger.sh
# against a known build # against a known build
BUILD=${BUILD:-7517585} BUILD=${BUILD:-N/A}
BRANCH=${BRANCH:-releases_19.4} BRANCH=${BRANCH:-untested}
REF=${REF:-master} REF=${REF:-master}
PROJECT=${PROJECT:-${CONTAINER}} PROJECT=${PROJECT:-${CONTAINER}}