jketreno/intel-media-ffmpeg
1
0
Fork 0
Code Issues Activity

Updated to latest xe-solutions

Browse Source 
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
scripts/build-dockerfile.sh
View File

@ -62,12 +62,12 @@ if [[ "${BUILD}" != "" ]] && [[ "${BUILD}" != "N/A" ]]; then
groovy) ARTIFACTORY_RELEASE=20.10 ;; # Groovy Gorilla
esac
ARTIFACTORY_RELEASE=${ARTIFACTORY_RELEASE:-${OS_RELEASE}}
VARS+=(ARTIFACTORY_PATH ARTIFACTORY_RELEASE)
export ARTIFACTORY_RELEASE
export ARTIFACTORY_PATH
TAG_SUFFIX=${BUILD}
else
TAG_SUFFIX=${PACKAGE_STREAM}
@ -101,7 +101,7 @@ for snippet in templates/??-*.in templates/${OS_DISTRO}/??-*.in; do
if [[ "${TEMPLATE_IGNORE}" != "" ]] && [[ ${snippet} =~ ${TEMPLATE_IGNORE} ]]; then
continue
fi
SNIPPETS+=($snippet)
done
@ -127,7 +127,7 @@ for snippet in ${SNIPPETS[@]}; do
if [[ ${snippet} =~ ..-repositories-intel-com.in ]]; then
continue
fi
else
else
# If a build was NOT specified, then do not include ??-local-file-intel-repo.in and
if [[ ${snippet} =~ ..-local-file-intel-repo.in ]]; then
continue

2
scripts/promote-image.sh
View File

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

24
scripts/push-image.sh
View File

@ -16,12 +16,24 @@ RELEASE_INFO=${RELEASE_INFO:-N/A}
TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
}
docker tag ${CONTAINER}:${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG} \
&& docker push ${REGISTRY_URL}/${CONTAINER}:${TAG} \
|| {
echo "Unable to tag and push image to ${REGISTRY_URL}."
exit 1
}
if ! docker tag ${CONTAINER}:${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG}; then
fail "Unable to tag .../${CONTAINER}:${TAG}"
fi
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-*" ]] && {
cat << EOM

4
scripts/trigger.sh
View File

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