initial CI trigger overhaul

.gitlab-ci.yml

@@ -1,28 +1,145 @@
 stages:
-- build
+- build-devel
-- test
+- test-devel
+- publish-rolling
 
-build_image:
+variables:
-  stage: build
+  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:
+  stage: "build-devel"
+  variables:
+    OS_DISTRO: ubuntu
+    OS_RELEASE: eoan
+    PACKAGE_STREAM: eoan-devel
   script:
-  - make
+  - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && scripts/build-dockerfile.sh && scripts/build-image.sh
-  after_script:
-  - ./scripts/clean-image.sh
   tags:
   - builder
   - ubuntu
-  - IVB
   only:
   - triggers
 
-test_image_devel:
+build_ubuntu_disco_devel_image:
-  stage: test
+  stage: "build-devel"
+  variables:
+    OS_DISTRO: ubuntu
+    OS_RELEASE: disco
+    PACKAGE_STREAM: disco-devel
   script:
-  - ./scripts/devel-test.sh
+  - export TAG=test-build-${OS_DISTRO}-${PACKAGE_STREAM}-$(date +%Y%m%d) && scripts/build-dockerfile.sh && scripts/build-image.sh
-  after_script:
+  tags:
-  - ./scripts/clean-image.sh
+  - 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:
+  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:
   - gen9
   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:
+  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)
+  - 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

Makefile

@@ -1,9 +0,0 @@
-all: build_ubuntu
-
-.PHONY: all
-
-build_ubuntu: Dockerfile.solution templates/*.in SOLUTION MANIFEST
-	@scripts/build-dockerfile
-	@scripts/build-images
-	@scripts/push-images
-

scripts/build-image.sh

@@ -11,8 +11,11 @@ fi
 . SOLUTION
 . MANIFEST
 
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION | ${CMD} -d '\n')
+VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST | ${CMD} -d '\n')
+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" ]] && {

scripts/clean-image.sh

@@ -11,7 +11,10 @@ fi
 . SOLUTION
 . MANIFEST
 
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION | ${CMD} -d '\n')
+VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST | ${CMD} -d '\n')
+VARS+=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST))
+for var in ${VARS[@]}; do
+  export ${var}
+done
 
 docker rmi ${REPO_URL}/${CONTAINER}:devel

scripts/push-image.sh

@@ -11,8 +11,11 @@ fi
 . SOLUTION
 . MANIFEST
 
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION | ${CMD} -d '\n')
+VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST | ${CMD} -d '\n')
+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" ]] && {

scripts/test-tag.sh

@@ -11,8 +11,20 @@ fi
 . SOLUTION
 . MANIFEST
 
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION | ${CMD} -d '\n')
+VARS=($(sed -nE "s,(^[^#][^=]*).*$,\1,pg" SOLUTION))
-export $(sed -nE "s,(^[^#][^=]*).*$,\1,pg" MANIFEST | ${CMD} -d '\n')
+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}}
+}
+
+docker pull ${REGISTRY_URL}/${CONTAINER}:${TAG}
 
 mkdir $(pwd)/media
 wget -O $(pwd)/media/AUD_MW_E.264 \
@@ -23,5 +35,5 @@ docker run \
   --device=/dev/dri \
   -e QSV_DEVICE=${QSV_DEVICE:-/dev/dri/renderD128} \
   --volume $(pwd)/media:/media \
-  ${REPO_URL}/${CONTAINER}:devel \
+  ${REGISTRY_URL}/${CONTAINER}:${TAG} \
   test