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

adding in unique tagging for concurrency fixes

Browse Source
This commit is contained in:
Jason L Hannan 2019-12-04 13:04:13 -08:00
parent 6cf37c6357
commit 4eb98fadc8
5 changed files with 30 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
.gitlab-ci.yml
View File

@ -39,6 +39,7 @@ publish_rolling_image:
stage: "publish-rolling" stage: "publish-rolling"
script: script:
- ./scripts/push-rolling-image.sh - ./scripts/push-rolling-image.sh
- ./scripts/remove-pipeline-tag.sh
tags: tags:
- builder - builder
- ubuntu - ubuntu

1
scripts/build-image.sh
View File

@ -17,6 +17,7 @@ RELEASE_INFO=${RELEASE_INFO:-N/A}
} || { } || {
TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}} TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
} }
TAG=${CI_PIPELINE_IID}-${TAG}
case "${OS_DISTRO}" in case "${OS_DISTRO}" in
rhel) rhel)

6
scripts/push-rolling-image.sh
View File

@ -24,8 +24,8 @@ RELEASE_INFO=${RELEASE_INFO:-N/A}
TAG=${TAG:-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}} TAG=${TAG:-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
} }
docker pull ${REGISTRY_URL}/${CONTAINER}:test-build-${TAG} docker pull ${REGISTRY_URL}/${CONTAINER}:${CI_PIPELINE_IID}-test-build-${TAG}
docker tag ${REGISTRY_URL}/${CONTAINER}:test-build-${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG} docker tag ${REGISTRY_URL}/${CONTAINER}:${CI_PIPELINE_IID}-test-build-${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG}
docker tag ${REGISTRY_URL}/${CONTAINER}:test-build-${TAG} ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM} docker tag ${REGISTRY_URL}/${CONTAINER}:${CI_PIPELINE_IID}-test-build-${TAG} ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM}
docker push ${REGISTRY_URL}/${CONTAINER}:${TAG} docker push ${REGISTRY_URL}/${CONTAINER}:${TAG}
docker push ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM} docker push ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM}

1
scripts/push-test-image.sh
View File

@ -17,6 +17,7 @@ RELEASE_INFO=${RELEASE_INFO:-N/A}
} || { } || {
TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}} TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
} }
TAG=${CI_PIPELINE_IID}-${TAG}
docker tag ${CONTAINER}:${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG} \ docker tag ${CONTAINER}:${TAG} ${REGISTRY_URL}/${CONTAINER}:${TAG} \
&& docker push ${REGISTRY_URL}/${CONTAINER}:${TAG} \ && docker push ${REGISTRY_URL}/${CONTAINER}:${TAG} \

24
scripts/remove-pipeline-tag.sh Normal file
View File

@ -0,0 +1,24 @@
#!/bin/bash
# Bring in the variables from SOLUTION file, supporting
# nested substitution
. SOLUTION
. MANIFEST
VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
VARS+=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST))
for var in ${VARS[@]}; do
export ${var}
done
RELEASE_INFO=${RELEASE_INFO:-N/A}
[[ "${RELEASE_INFO}" == "N/A" ]] && {
TAG=${TAG:-test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d)}
} || {
TAG=${TAG:-test-${OS_DISTRO}-${PACKAGE_STREAM}-${RELEASE_INFO}}
}
TAG=${CI_PIPELINE_IID}-${TAG}
curl -i -k -u ${HARBOR_USER}:${HARBOR_PASSWD} \
-X DELETE "https://amr-registry.caas.intel.com/api/repositories/vtt-osgc%2Fsolutions%2F${CONTAINER}/tags/${TAG}" \
-H "accept: application/json"