Merge branch 'master' into 'dev'

Master

See merge request software/services/fair/ci-services!18

.gitlab-ci.yml

@@ -7,7 +7,6 @@ stages:
   - build-deploy
   - test
   - ci-services
-  - reuse
 
 variables:
   VERSION: 0.4.0
@@ -94,11 +93,11 @@ test:pylint:
     - SCORE=${SCORE%/*/*}
     - SCORE=${SCORE##* }
     - echo $SCORE
-#  only:
-#    changes:
-#      - "**/*.py"
+  only:
+    changes:
+      - "**/*.py"
 
-test:unittest:
+test:python-unittest:
   stage: test
   image: python:3
   tags:
@@ -182,8 +181,8 @@ test:production:
       - "**/*.yml"
   artifacts:
     paths:
-      - /repo/meta
-      - /repo/test
+      - meta
+      - test
     when: on_failure
     expire_in: 1 day
 
@@ -209,6 +208,9 @@ ci-services:dev:
     - cp -r "$CI_PROJECT_DIR" /repo
     - docker-entrypoint.sh --all
     - cp -rT /repo "$CI_PROJECT_DIR"
+    - cd meta
+    - find -mindepth 1 -maxdepth 1 -type d -exec rm -r {} \;
+    - cd ..
     - git add -f .
     - git commit -m "[AUTOMATIC] generated meta/ci-services-report.md by gitlab ci"
     - git push "git@${CI_SERVER_HOST}:${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}.git" "HEAD:${CI_COMMIT_REF_NAME}"
@@ -217,7 +219,7 @@ ci-services:dev:
     refs:
       - master
     changes:
-      - "meta/**/*"
+      - "meta/ci-services-report.md"
   artifacts:
     paths:
       - "meta/ci-services-report.md"
@@ -245,6 +247,9 @@ ci-services:production:
     - cp -r "$CI_PROJECT_DIR" /repo
     - docker-entrypoint.sh --all
     - cp -rT /repo "$CI_PROJECT_DIR"
+    - cd meta
+    - find -mindepth 1 -maxdepth 1 -type d -exec rm -r {} \;
+    - cd ..
     - git add -f .
     - git commit -m "[AUTOMATIC] generated meta/ci-services-report.md by gitlab ci"
     - git push "git@${CI_SERVER_HOST}:${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}.git" "HEAD:${CI_COMMIT_REF_NAME}"
@@ -254,7 +259,7 @@ ci-services:production:
       - master
   except:
     changes:
-      - "meta/**/*"
+      - "meta/ci-services-report.md"
   artifacts:
     paths:
       - "meta/ci-services-report.md"

doc/doc_service_description.md

@@ -21,7 +21,7 @@ SPDX-License-Identifier: CC0-1.0
 All implemented services will generate a a yaml file in `meta/[SERVICE_NAME]` containing the results.
 
 Furthermore all settings for the services will be done in a `.ci-services.yaml` file in the root directory of the project.
-An example for a [.ci-services.yaml](../.ci-services.yaml) can be found in this project and an empty commented file below:
+An example for a [.ci-services.yaml](.ci-services.yml) can be found in this project and an empty commented file below:
 
 ```yaml
 # exclude patterns for license check

doc/doc_usage_ci.md

@@ -25,7 +25,7 @@ There are two different ways to get the generated report by the `ci-services`.
 
 When you opt for this option, the report is available via the GitLab web-interface.
 You can simply download.
-More information available (here)[https://docs.gitlab.com/ee/ci/pipelines/job_artifacts.html]
+More information available [here](https://docs.gitlab.com/ee/ci/pipelines/job_artifacts.html)
 
 This option is easier to set up.
 
@@ -86,7 +86,7 @@ ci-services:
   script:
     - cp -r "$CI_PROJECT_DIR" /repo
     - rm -rf /repo/meta
-    - docker-entrypoint.sh --test
+    - docker-entrypoint.sh --all
     - cp -rT /repo "$CI_PROJECT_DIR"
   only:
     refs:
@@ -177,20 +177,25 @@ ci-services:
     - echo "$SSH_KNOWN_HOSTS_GITLAB" > ~/.ssh/known_hosts
     - chmod 644 ~/.ssh/known_hosts
   script:
-    - mkdir -p  /repo
-    - cp -r "$CI_PROJECT_DIR/." /repo
-    - docker-entrypoint.sh -all
-    - cp -rf /repo/meta "$CI_PROJECT_DIR"
     - eval $(ssh-agent -s)
     - echo "$GITLAB_DEPLOY_KEY" | tr -d '\r' | ssh-add -
     - git config user.name "GitLab CI:${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}"
     - git config user.email "[PROJECT_NAME]_ci-services"
-    - git add -f meta/ci-services-report.md
+    - cp -r "$CI_PROJECT_DIR" /repo
+    - docker-entrypoint.sh --all
+    - cp -rT /repo "$CI_PROJECT_DIR"
+    - cd meta
+    - find -mindepth 1 -maxdepth 1 -type d -exec rm -r {} \;
+    - cd ..
+    - git add -f .
     - git commit -m "[AUTOMATIC] generated meta/ci-services-report.md by gitlab ci"
     - git push "git@${CI_SERVER_HOST}:${CI_PROJECT_NAMESPACE}/${CI_PROJECT_NAME}.git" "HEAD:${CI_COMMIT_REF_NAME}"
   only:
     refs:
       - master
+  except:
+    changes:
+      - "meta/ci-services-report.md"
 ```
 
 **Important**

meta/ci-services-report.md

@@ -7,11 +7,11 @@
 
 **Software Name:** ci-services
 
-**Software Location:** local
+**Software Location:** [gitext](https://gitext.gfz-potsdam.de/software/services/fair/ci-services)
 
-**Last Commit:** 0
+**Last Commit:** f725c80fd5d03418ff674dd21542b3dce406b246
 
-**Report Time:** 0
+**Report Time:** 25/05/2020 15:53:26
 
 **Report Version:** 0.4.0
 
@@ -34,11 +34,11 @@
 
 |language|bytes of code|
 |---|---|
-|Dockerfile|0|
-|HTML|0|
-|Python|0|
-|Ruby|0|
-|Shell|0|
+|Dockerfile|6617|
+|HTML|1834|
+|Python|61173|
+|Ruby|2990|
+|Shell|19337|
 
 ### list used licenses
 
@@ -51,42 +51,9 @@
 |Apache 2.0|1|requests|
 |GPL-3.0-or-later AND Apache-2.0 AND CC0-1.0 AND CC-BY-SA-4.0|1|reuse|
 |MIT|2|PyYAML <br> stdlib-list|
-|Python-2.0|10|datetime <br> importlib.util <br> json <br> os <br> pathlib <br> re <br> shutil <br> sys <br> time <br> unittest|
+|Python-2.0|8|datetime <br> json <br> os <br> pathlib <br> re <br> shutil <br> sys <br> time|
 |mock|1|stdlib|
 
-#### Unknown objects
-
-**unknown language**
-
-* src/services/apply-license/data/templates/dep5_template
-* test/linter/pylintrc
-* test/testfiles/unknown_language/test.testlanguage
-
-**unknown license**
-
-* Python / ./downloads/numpy-1.9.2-cp34-none-win32.whl / unknown location
-
-* Python / Mopidy-Dirble / unsupported version modifier (~=1.1)
-
-* Python / beautifulsoup4 / unknown version
-
-* Python / coverage / unsupported version modifier (!=3.5)
-
-* Python / docopt / unsupported version modifier (>=0.5.0)
-
-* Python / green / unknown version
-
-* Python / http://wxpython.org/Phoenix/snapshot-builds/wxPython_Phoenix-3.0.3.dev1820+49a8884-cp34-none-win_amd64.whl / unknown location
-
-* Python / keyring / unsupported version modifier (>=4.1.1)
-
-* Python / nose / unknown version
-
-* Python / nose-cov / unknown version
-
-* Python / rejected / unknown version
-
-
 ### reuse linter
 
 > **Description: Prints the result of the [reuse](https://reuse.software/spec/) linter**
@@ -99,8 +66,8 @@
 * Unused licenses:
 * Used licenses: CC-BY-4.0, CC0-1.0, GPL-3.0-or-later
 * Read errors: 0
-* Files with copyright information: 67 / 67
-* Files with license information: 67 / 67
+* Files with copyright information: 68 / 68
+* Files with license information: 68 / 68
 
 Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-)
 

meta/list-authors/authors.txt

-ci-services@gitext.gfz-potsdam.de
-mdolling@gfz-potsdam.de

meta/list-authors/authors.txt.license

-SPDX-FileCopyrightText: 2020 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences Potsdam, Germany (https://www.gfz-potsdam.de/)
-
-SPDX-License-Identifier: CC0-1.0
\ No newline at end of file

meta/list-authors/subreport-list-authors.yml

-# SPDX-FileCopyrightText: 2020 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences Potsdam, Germany (https://www.gfz-potsdam.de/)
-#
-# SPDX-License-Identifier: CC0-1.0
-
-last commit hash: b2e844ee99ad9b3196ec54b2adb5b2085117f154
-list authors:
-  description: Lists all people that committed to this repository.
-  result:
-  - ci-services@gitext.gfz-potsdam.de
-  - mdolling@gfz-potsdam.de
-location: local
-name: ci-services
-report time: 25/05/2020 15:11:14
-report version: 0.4.0

meta/list-used-languages/subreport-list-used-languages.yml

-# SPDX-FileCopyrightText: 2020 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences Potsdam, Germany (https://www.gfz-potsdam.de/)
-#
-# SPDX-License-Identifier: CC0-1.0
-
----
-last commit hash: b2e844ee99ad9b3196ec54b2adb5b2085117f154
-name: ci-services
-report time: 25/05/2020 15:11:16
-location: local
-report version: 0.4.0
-list used languages:
-  description: Detects used programming languages.
-  result:
-    Ruby: 2990
-    Dockerfile: 6617
-    Shell: 19337
-    Python: 61173
-    HTML: 1834

meta/list-used-licenses/subreport-list-used-licenses.yml

-# SPDX-FileCopyrightText: 2020 Helmholtz Centre Potsdam - GFZ German Research Centre for Geosciences Potsdam, Germany (https://www.gfz-potsdam.de/)
-#
-# SPDX-License-Identifier: CC0-1.0
-
-last commit hash: b2e844ee99ad9b3196ec54b2adb5b2085117f154
-list used licenses:
-  description: Generates a list of dependencies and their license.
-  result:
-    license list:
-      Apache 2.0:
-        count: 1
-        lib:
-        - requests
-      GPL-3.0-or-later AND Apache-2.0 AND CC0-1.0 AND CC-BY-SA-4.0:
-        count: 1
-        lib:
-        - reuse
-      MIT:
-        count: 2
-        lib:
-        - PyYAML
-        - stdlib-list
-      Python-2.0:
-        count: 10
-        lib:
-        - os
-        - re
-        - sys
-        - time
-        - datetime
-        - pathlib
-        - json
-        - shutil
-        - unittest
-        - importlib.util
-      mock:
-        count: 1
-        lib:
-        - stdlib
-    unknowns:
-      language:
-      - src/services/apply-license/data/templates/dep5_template
-      - test/testfiles/unknown_language/test.testlanguage
-      - test/linter/pylintrc
-      libraries:
-        Python:
-          ./downloads/numpy-1.9.2-cp34-none-win32.whl: unknown location
-          Mopidy-Dirble: unsupported version modifier (~=1.1)
-          beautifulsoup4: unknown version
-          coverage: unsupported version modifier (!=3.5)
-          docopt: unsupported version modifier (>=0.5.0)
-          green: unknown version
-          http://wxpython.org/Phoenix/snapshot-builds/wxPython_Phoenix-3.0.3.dev1820+49a8884-cp34-none-win_amd64.whl: unknown
-            location
-          keyring: unsupported version modifier (>=4.1.1)
-          nose: unknown version
-          nose-cov: unknown version
-          rejected: unknown version
-location: local
-name: ci-services
-report time: 25/05/2020 15:11:19
-report version: 0.4.0

meta/reuse-lint/reuse-lint.txt

-
-* Bad licenses:
-* Deprecated licenses:
-* Licenses without file extension:
-* Missing licenses:
-* Unused licenses:
-* Used licenses: CC-BY-4.0, CC0-1.0, GPL-3.0-or-later
-* Read errors: 0
-* Files with copyright information: 67 / 67
-* Files with license information: 67 / 67
-
-Congratulations! Your project is compliant with version 3.0 of the REUSE Specification :-)

meta/reuse-lint/subreport-reuse-lint.yml

-last commit hash: b2e844ee99ad9b3196ec54b2adb5b2085117f154
-location: local
-name: ci-services
-report time: 25/05/2020 15:11:41
-report version: 0.4.0
-reuse linter:
-  description: Prints the result of the [reuse](https://reuse.software/spec/) linter
-  result: '
-
-    * Bad licenses:
-
-    * Deprecated licenses:
-
-    * Licenses without file extension:
-
-    * Missing licenses:
-
-    * Unused licenses:
-
-    * Used licenses: CC-BY-4.0, CC0-1.0, GPL-3.0-or-later
-
-    * Read errors: 0
-
-    * Files with copyright information: 67 / 67
-
-    * Files with license information: 67 / 67
-
-
-    Congratulations! Your project is compliant with version 3.0 of the REUSE Specification
-    :-)
-
-    '