Merge branch 'bugfix/cicd' into 'master'

Bugfix/cicd

See merge request ins/nettowel/nettowel-nuts!36

Author: bytinbit

.github/workflows/publish-to-pypi.yml

@@ -34,4 +34,4 @@ jobs:
           body_path: release_notes/${{ steps.tag-val.outputs.SOURCE_TAG }}.md
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          GITHUB_REPOSITORY: bytinbit/nuts-test
+          GITHUB_REPOSITORY: INSRapperswil/nuts

.gitlab-ci.yml

@@ -1,3 +1,11 @@
+default:
+  image: python:3.7
+  before_script:
+    - echo ===== update pip =====
+    - python -m pip install -U pip
+    - echo ===== install tox =====
+    - pip install tox
+
 stages:
   - pytest
   - quality
@@ -13,16 +21,9 @@ cache:
 
 pytest:
   stage: pytest
-  image: python:3.7 
-  # several python versions in 1 image: quay.io/python-devs/ci-image
-  before_script:
-    - echo ===== update pip =====
-    - python -m pip install -U pip
-    - echo ===== install tox =====
-    - pip install tox
+  script:
     - echo ===== create folder for artifacts =====
     - mkdir test-reports
-  script:
     - tox -e py
   artifacts:
     when: always
@@ -35,48 +36,25 @@ pytest:
 black:
   stage: quality
   image: python:3.7 
-  before_script:
-    - echo ===== update pip =====
-    - python -m pip install -U pip
-    - echo ===== install tox =====
-    - pip install tox
   script:
     - tox -e black
 
 mypy:
   stage: quality
-  image: python:3.7
-  before_script:
-    - echo ===== update pip =====
-    - python -m pip install -U pip
-    - echo ===== install tox =====
-    - pip install tox
   script:
     - tox -e mypy
 
 docs:
   stage: quality
-  image: python:3.7
-  before_script:
-    - echo ===== update pip =====
-    - python -m pip install -U pip
-    - echo ===== install tox =====
-    - pip install tox
   script:
     - tox -e docs    
 
 pytest-main:
 # run test using directly the pytest main branch  
   stage: pytest
-  image: python:3.7
-  before_script:
-    - echo ===== update pip =====
-    - python -m pip install -U pip
-    - echo ===== install tox =====
-    - pip install tox
+  script:
     - echo ===== create folder for artifacts =====
     - mkdir test-reports
-  script:
     - tox -e pytest-main
   artifacts:
     when: always
@@ -89,12 +67,12 @@ pytest-main:
     - if: $CI_PIPELINE_SOURCE == "schedule"
 
 sonar:
+  image: sonarsource/sonar-scanner-cli
   stage: sonar
+  before_script: []
   variables:
     SONAR_HOST_URL: $INS_SONAR_URL
     SONAR_LOGIN: $INS_SONAR_LOGIN
-  image:
-    name: sonarsource/sonar-scanner-cli
   script:
     - sonar-scanner -Dsonar.projectKey=$CI_PROJECT_NAME -Dsonar.branch.name=$CI_BUILD_REF_NAME -Dsonar.python.coverage.reportPaths=test-reports/coverage.xml
   allow_failure: true