From ec24fc8f812711ead55ab3d7c610e352634d14fb Mon Sep 17 00:00:00 2001 From: Jason L Hannan Date: Thu, 21 Nov 2019 11:43:13 -0800 Subject: [PATCH] reducing ci file to templated version --- .gitlab-ci.yml | 113 ++++--------------------------------------------- 1 file changed, 8 insertions(+), 105 deletions(-) diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7408d84..85c0ecf 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -3,18 +3,19 @@ stages: - test-devel - publish-rolling +# Required Input From Trigger +# OS_DISTRO: ex. ubuntu +# OS_RELEASE: ex. eoan +# PACKAGE_STREAM: ex. eoan + variables: ci_token: "38569832d11dfd78ba2a457ebb5b99" PACKAGE_REPOSITORY: "https://repositories.intel.com/graphics" REGISTRY_URL: "amr-registry.caas.intel.com/vtt-osgc/solutions" CONTAINER: "intel-media-ffmpeg" -build_ubuntu_eoan_devel_image: +build_devel_image: stage: "build-devel" - variables: - OS_DISTRO: ubuntu - OS_RELEASE: eoan - PACKAGE_STREAM: eoan-devel script: - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && scripts/build-dockerfile.sh && scripts/build-image.sh tags: @@ -23,40 +24,8 @@ build_ubuntu_eoan_devel_image: only: - triggers -build_ubuntu_disco_devel_image: - stage: "build-devel" - variables: - OS_DISTRO: ubuntu - OS_RELEASE: disco - PACKAGE_STREAM: disco-devel - script: - - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && scripts/build-dockerfile.sh && scripts/build-image.sh - tags: - - builder - - ubuntu - only: - - triggers - -build_rhel_8_0_devel_image: - stage: "build-devel" - variables: - OS_DISTRO: rhel - OS_RELEASE: "8.0" - PACKAGE_STREAM: "8.0-devel" - script: - - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && scripts/build-dockerfile.sh && scripts/build-image.sh - tags: - - builder - - ubuntu - only: - - triggers - -test_ubuntu_eoan_devel_image: +test_devel_image: stage: "test-devel" - variables: - OS_DISTRO: ubuntu - OS_RELEASE: eoan - PACKAGE_STREAM: eoan-devel script: - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && ./scripts/test-tag.sh tags: @@ -64,74 +33,8 @@ test_ubuntu_eoan_devel_image: only: - triggers -test_ubuntu_disco_devel_image: - stage: "test-devel" - variables: - OS_DISTRO: ubuntu - OS_RELEASE: disco - PACKAGE_STREAM: disco-devel - script: - - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && ./scripts/test-tag.sh - tags: - - gen9 - only: - - triggers - -test_rhel_8_0_devel_image: - stage: "test-devel" - variables: - OS_DISTRO: rhel - OS_RELEASE: "8.0" - PACKAGE_STREAM: "8.0-devel" - script: - - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && ./scripts/test-tag.sh - tags: - - gen9 - only: - - triggers - -publish_ubuntu_eoan_rolling_image: +publish_rolling_image: stage: "publish-rolling" - variables: - OS_DISTRO: ubuntu - OS_RELEASE: eoan - PACKAGE_STREAM: eoan-devel - script: - - docker pull ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) - - docker tag ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) ${REGISTRY_URL}/${CONTAINER}:${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) - - docker tag ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM} - - docker push ${REGISTRY_URL}/${CONTAINER}:${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) - - docker push ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM} - tags: - - builder - - ubuntu - only: - - triggers - -publish_ubuntu_disco_rolling_image: - stage: "publish-rolling" - variables: - OS_DISTRO: ubuntu - OS_RELEASE: disco - PACKAGE_STREAM: disco-devel - script: - - docker pull ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) - - docker tag ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) ${REGISTRY_URL}/${CONTAINER}:${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) - - docker tag ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM} - - docker push ${REGISTRY_URL}/${CONTAINER}:${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) - - docker push ${REGISTRY_URL}/${CONTAINER}:latest-${OS_DISTRO}-${PACKAGE_STREAM} - tags: - - builder - - ubuntu - only: - - triggers - -publish_rhel_8_0_rolling_image: - stage: "publish-rolling" - variables: - OS_DISTRO: rhel - OS_RELEASE: "8.0" - PACKAGE_STREAM: "8.0-devel" script: - docker pull ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) - docker tag ${REGISTRY_URL}/${CONTAINER}:test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) ${REGISTRY_URL}/${CONTAINER}:${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d)