From d049d54f9cb464467ac2a00c3d9bed1d3d4daa12 Mon Sep 17 00:00:00 2001
From: Erick Hitter <git-contrib@ethitter.com>
Date: Mon, 27 May 2019 21:19:35 -0700
Subject: [PATCH] "Namespace" artifacts by the Debian release they correspond
 to

Fixes #2
---
 .gitlab-ci.yml | 33 +++++++++++++++++++++------------
 1 file changed, 21 insertions(+), 12 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 0e361f7..a4d11fa 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -7,6 +7,12 @@ before_script:
   - chmod +x nginx-build
   - ./nginx-build -V
 
+after_script:
+  - export $BUILD_DIR=$CI_PROJECT_DIR/deb-$(lsb_release -r)
+  - mkdir $BUILD_DIR
+  - mv $CI_PROJECT_DIR/nginx_${NGINX_VERSION}* $BUILD_DIR
+  - mv $CI_PROJECT_DIR/nginx-dbgsym_* $BUILD_DIR
+
 build-deb:jessie:
   stage: build
   image: containers.ethitter.com:443/docker/images/debian:jessie
@@ -18,17 +24,18 @@ build-deb:jessie:
     - debuild -us -uc
   artifacts:
     paths:
-      - nginx_${NGINX_VERSION}*
-      - nginx-dbgsym_*
+      - $BUILD_DIR
 
 test-deb:jessie:
   stage: test
   image: containers.ethitter.com:443/docker/images/debian:jessie
   before_script:
-    - date
+    - ''
   script:
-    - dpkg -i nginx_${NGINX_VERSION_JESSIE}*.deb
+    - dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_JESSIE}*.deb
     - nginx -V
+  after_script:
+    - ''
   dependencies:
     - build-deb:jessie
 
@@ -43,17 +50,18 @@ build-deb:stretch:
     - debuild -us -uc
   artifacts:
     paths:
-      - nginx_${NGINX_VERSION}*
-      - nginx-dbgsym_*
+      - $BUILD_DIR
 
 test-deb:stretch:
   stage: test
   image: containers.ethitter.com:443/docker/images/debian:stretch
   before_script:
-    - date
+    - ''
   script:
-    - dpkg -i nginx_${NGINX_VERSION_STRECTH}*.deb
+    - dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_STRECTH}*.deb
     - nginx -V
+  after_script:
+    - ''
   dependencies:
     - build-deb:stretch
 
@@ -68,16 +76,17 @@ build-deb:buster:
     - debuild -us -uc
   artifacts:
     paths:
-      - nginx_${NGINX_VERSION}*
-      - nginx-dbgsym_*
+      - $BUILD_DIR
 
 test-deb:buster:
   stage: test
   image: containers.ethitter.com:443/docker/images/debian:buster
   before_script:
-    - date
+    - ''
   script:
-    - dpkg -i nginx_${NGINX_VERSION_BUSTER}*.deb
+    - dpkg -i deb-$(lsb_release -r)/nginx_${NGINX_VERSION_BUSTER}*.deb
     - nginx -V
+  after_script:
+    - ''
   dependencies:
     - build-deb:buster
-- 
GitLab