From 3fc5ca8c0815a9cdd3c147d6e0e7a6f61f359eef Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?J=2E=20Fernando=20S=C3=A1nchez?= <balkian@gmail.com>
Date: Mon, 7 Mar 2022 12:44:40 +0100
Subject: [PATCH] Fix requirements issue CI/CD

---
 .gitlab-ci.yml | 36 +++++++++++++++++++++++++++++-------
 CHANGELOG.md   |  3 +++
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 3161a87..481ce08 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,9 +1,10 @@
 stages:
   - test
-  - build
+  - publish
+  - check_published
 
-build:
-  stage: build
+docker:
+  stage: publish
   image:
     name: gcr.io/kaniko-project/executor:debug
     entrypoint: [""]
@@ -16,13 +17,34 @@ build:
   only:
     - tags
 
-
 test:
-  except:
-    - tags  # Avoid running tests for tags, because they are already run for the branch
   tags:
     - docker
   image: python:3.7
   stage: test
   script:
-    - python setup.py test
\ No newline at end of file
+    - pip install -r requirements.txt -r test-requirements.txt
+    - python setup.py test
+
+pypi:
+  only:
+    - tags
+  tags:
+    - docker
+  image: python:3.7
+  stage: publish
+  script:
+    - echo $CI_COMMIT_TAG > soil/VERSION
+    - pip install twine
+    - python setup.py sdist bdist_wheel
+    - TWINE_PASSWORD=${PYPI_PASSWORD} TWINE_USERNAME={PYPI_USERNAME} python -m twine upload --ignore-existing dist/*
+
+pypi:
+  only:
+    - tags
+  tags:
+    - docker
+  image: python:3.7
+  stage: check_published
+  script:
+    - pip install soil==$CI_COMMIT_TAG
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b485cf5..eefbb44 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,6 +3,9 @@ All notable changes to this project will be documented in this file.
 
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/), and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.20.2]
+### Fixed
+* CI/CD testing issues
 ## [0.20.1]
 ### Fixed
 * Agents would run another step after dying.