From 904d15de75a78a0c2d7d4f073db9fce129de91f6 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Fri, 22 May 2020 16:29:37 +1000
Subject: [PATCH] Created a stretch ci environment

---
 .gitlab-ci.yml            | 37 ++++---------------------------------
 .gitlab-docker-armv7l.yml | 16 ++++++++++++++++
 .gitlab-docker-x86_64.yml | 16 ++++++++++++++++
 3 files changed, 36 insertions(+), 33 deletions(-)
 create mode 100644 .gitlab-docker-armv7l.yml
 create mode 100644 .gitlab-docker-x86_64.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 590be4a..122e146 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -3,6 +3,7 @@ stages:
 
 variables:
   CACHETAG: build-${VERSION}
+  DISTRO: stretch
   DOCKER_HOST: tcp://docker:2375
 
 services:
@@ -14,36 +15,6 @@ before_script:
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
 - env|sort
 
-x86_64:build:
-  variables:
-    VERSION: x86_64
-  stage: build
-  image: docker:latest
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
-  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
-  tags:
-  - docker
-  - x86_64
-  only:
-  - master
-
-armv7l:build:
-  variables:
-    VERSION: armv7l
-  stage: build
-  image: docker:latest
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
-  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
-  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
-  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
-  tags:
-  - docker
-  - armv7l
-  only:
-  - master
+include:
+  - .gitlab-docker-x86_64.yml
+  - .gitlab-docker-armv7l.yml
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
new file mode 100644
index 0000000..4d35f46
--- /dev/null
+++ b/.gitlab-docker-armv7l.yml
@@ -0,0 +1,16 @@
+armv7l:build:
+  variables:
+    VERSION: armv7l-${DISTRO}
+  stage: build
+  image: docker:latest
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
+  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
+  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+  tags:
+  - docker
+  - armv7l
+  only:
+  - ${DISTRO}
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker-x86_64.yml
new file mode 100644
index 0000000..abace56
--- /dev/null
+++ b/.gitlab-docker-x86_64.yml
@@ -0,0 +1,16 @@
+x86_64:build:
+  variables:
+    VERSION: x86_64-${DISTRO}
+  stage: build
+  image: docker:latest
+  script:
+  - if [ -f init ]; then chmod 500 init; fi
+  - docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG} || true
+  - docker build --cache-from ${CI_REGISTRY_IMAGE}:${CACHETAG} -t ${CI_REGISTRY_IMAGE}:${VERSION} -t ${CI_REGISTRY_IMAGE}:${CACHETAG} .
+  - docker push ${CI_REGISTRY_IMAGE}:${VERSION}
+  - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
+  tags:
+  - docker
+  - x86_64
+  only:
+  - ${DISTRO}