From 3ef795079c11af2a12bc1a8bed43a020d1fde000 Mon Sep 17 00:00:00 2001
From: Deon George <deon@leenooks.net>
Date: Thu, 25 Jul 2019 21:13:50 +1000
Subject: [PATCH] Consilidate gitlab-ci files

---
 .gitlab-ci.yml                                  |  4 +---
 .gitlab-docker-armv7l.yml                       | 16 ----------------
 .gitlab-docker-x86_64.yml => .gitlab-docker.yml |  5 ++---
 3 files changed, 3 insertions(+), 22 deletions(-)
 delete mode 100644 .gitlab-docker-armv7l.yml
 rename .gitlab-docker-x86_64.yml => .gitlab-docker.yml (95%)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 9eb5ea6..8061c84 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -15,7 +15,5 @@ before_script:
 - docker info
 - docker version
 - echo "$CI_JOB_TOKEN" | docker login -u "$CI_REGISTRY_USER" "$CI_REGISTRY" --password-stdin
-- ls -alR .
 
-include: .gitlab-docker-x86_64.yml
-#include: .gitlab-docker-armv7l.yml
+include: .gitlab-docker.yml
diff --git a/.gitlab-docker-armv7l.yml b/.gitlab-docker-armv7l.yml
deleted file mode 100644
index 4f823cb..0000000
--- a/.gitlab-docker-armv7l.yml
+++ /dev/null
@@ -1,16 +0,0 @@
-armv7l:build:
-  variables:
-    ARCH: armv7l
-  stage: build
-  image: docker:latest
-  script:
-  - if [ -f init ]; then chmod 500 init; fi
-  - ([ -z "$REFRESH" ] && docker pull ${CI_REGISTRY_IMAGE}:${CACHETAG}) || echo "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
diff --git a/.gitlab-docker-x86_64.yml b/.gitlab-docker.yml
similarity index 95%
rename from .gitlab-docker-x86_64.yml
rename to .gitlab-docker.yml
index 67d1cf4..9d97eb5 100644
--- a/.gitlab-docker-x86_64.yml
+++ b/.gitlab-docker.yml
@@ -11,7 +11,6 @@ x86_64:build:
   - docker push ${CI_REGISTRY_IMAGE}:${CACHETAG}
   tags:
   - docker
-  - x86_64
+  - ${ARCH}
   only:
-  - master
-
+  - ${ARCH}