From abfbda172ddcc6de0c2447873cc2be43bdcc878f Mon Sep 17 00:00:00 2001
From: Manuel Zedel <manuel.zedel@northern.tech>
Date: Mon, 1 Jul 2019 14:46:15 +0200
Subject: [PATCH 1/2] added initial gitlab pipeline

Changelog: None
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
---
 .gitlab-ci.yml | 33 +++++++++++++++++++++++++++++++++
 1 file changed, 33 insertions(+)
 create mode 100644 .gitlab-ci.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
new file mode 100644
index 0000000..f5bdc25
--- /dev/null
+++ b/.gitlab-ci.yml
@@ -0,0 +1,33 @@
+image: docker:git
+
+variables:
+  DOCKER_REPOSITORY: mendersoftware/mender-convert
+  IMAGE_NAME: mender-convert
+  MENDER_CLIENT_VERSION: '2.0.0'
+
+stages:
+  - test
+  - build
+
+test:
+  stage: test
+  script:
+    - apk add --no-cache bash
+    - git clone git://github.com/mendersoftware/mendertesting
+    # Check commit compliance.
+    - mendertesting/check_commits.sh
+    # Check licenses
+    - mendertesting/check_license.sh
+
+build:
+  stage: build
+  services:
+    - docker:dind
+  script:
+    - docker build -t ${IMAGE_NAME} --build-arg mender_client_version=${MENDER_CLIENT_VERSION} .
+    - docker save $DOCKER_REPOSITORY:pr > image.tar
+  artifacts:
+    expire_in: 2w
+    paths:
+      - image.tar
+

From 8af7b84ddbd515c472893c0417c612914ea50589 Mon Sep 17 00:00:00 2001
From: Manuel Zedel <manuel.zedel@northern.tech>
Date: Tue, 2 Jul 2019 13:33:00 +0200
Subject: [PATCH 2/2] added shasum dependency to gitlab pipeline

Changelog: None
Signed-off-by: Manuel Zedel <manuel.zedel@northern.tech>
---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f5bdc25..d2d0fa6 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -2,7 +2,6 @@ image: docker:git
 
 variables:
   DOCKER_REPOSITORY: mendersoftware/mender-convert
-  IMAGE_NAME: mender-convert
   MENDER_CLIENT_VERSION: '2.0.0'
 
 stages:
@@ -12,7 +11,7 @@ stages:
 test:
   stage: test
   script:
-    - apk add --no-cache bash
+    - apk add --no-cache bash perl-utils
     - git clone git://github.com/mendersoftware/mendertesting
     # Check commit compliance.
     - mendertesting/check_commits.sh
@@ -24,7 +23,7 @@ build:
   services:
     - docker:dind
   script:
-    - docker build -t ${IMAGE_NAME} --build-arg mender_client_version=${MENDER_CLIENT_VERSION} .
+    - docker build -t $DOCKER_REPOSITORY:pr --build-arg mender_client_version=${MENDER_CLIENT_VERSION} .
     - docker save $DOCKER_REPOSITORY:pr > image.tar
   artifacts:
     expire_in: 2w