Commit 522df964 authored by Thomas Boni's avatar Thomas Boni
Browse files

Merge branch '320-fix-jobs-tools-versions' into 'latest' 

Resolve "Fix jobs tools versions"

Closes #320

See merge request r2devops/hub!167
parents 1980eb1f 56fb4d1c

jobs/newman/README.md

+2 −1
Original line number Diff line number Diff line
@@ -70,7 +70,8 @@ Launch a Postman collection of requests to test your API using [newman](https:// 
| `NEWMAN_ADDITIONAL_OPTIONS` | Other [options](https://learning.postman.com/docs/running-collections/using-newman-cli/command-line-integration-with-newman/) you may want to use with Newman | ` ` |

| `NEWMAN_FAIL_ON_ERROR` | Fail job on a request/test error | `true` |

| `NEWMAN_ITERATIONS_NUMBER` | Number of Newman iterations to run (see [documentation](https://learning.postman.com/docs/running-collections/using-newman-cli/command-line-integration-with-newman/#misc)) | `2` |



| `NEWMAN_VERSION` | Newman version | `5.2.2` |

| `NEWMAN_JUNIT_VERSION` | Newman JUnit reporter tool's version | `1.1.1` |

### Artifact



We use [Junit](https://junit.org/junit5/){:target="_blank"}'s XML report to

jobs/newman/newman.yml

+4 −2
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ stages: 
  - dynamic_tests



newman:

  image: node:15.4.0

  image: node:15.10.0

  stage: dynamic_tests

  variables:

    NEWMAN_COLLECTION: "postman_collection.json"
@@ -11,8 +11,10 @@ newman: 
    NEWMAN_JUNIT_REPORT: "newman-report.xml"

    NEWMAN_FAIL_ON_ERROR: "true"

    NEWMAN_ITERATIONS_NUMBER: "2"

    NEWMAN_VERSION: "5.2.2"

    NEWMAN_JUNIT_VERSION: "1.1.1"

  script:

    - npm install -g newman newman-reporter-junitfull

    - npm install -g newman@${NEWMAN_VERSION} newman-reporter-junitfull@${NEWMAN_JUNIT_VERSION}

    - if [[ ! -z ${NEWMAN_GLOBALS_FILE} ]]; then

    -   NEWMAN_ADDITIONAL_OPTIONS+=" -g ${NEWMAN_GLOBALS_FILE}"

    - fi

jobs/newman/versions/0.2.1.md

0 → 100644
+3 −0
Original line number Diff line number Diff line 
* Update docker image version to `15.10.0`

* Fix version of `newman` package to `5.2.2` through variable `NEWMAN_VERSION`

* Fix version of `newman-reporter-junitfull` package to `1.1.1` through variable `NEWMAN_JUNIT_VERSION`
 
 No newline at end of file

jobs/nmap/README.md

+1 −0
Original line number Diff line number Diff line
@@ -56,3 +56,4 @@ if one of them should not be. 
| `NMAP_OPTIONS` | Additional options you may want for the scan (`man nmap`) | ` ` |

| `NMAP_OUTPUT` | Name for the XML output file for nmap | `nmap-report.xml` |

| `HTML_OUTPUT` | Name for the html file for the Merge Request Widget for this job | `nmap-report.html` |

| `LIBXSLT_VERSION` | Tool's version of LibXslt | `1.1.34-r0` | 
 No newline at end of file

jobs/nmap/nmap.yml

+2 −1
Original line number Diff line number Diff line
@@ -12,8 +12,9 @@ nmap: 
    NMAP_OPTIONS: ""

    NMAP_OUTPUT: "nmap-report.xml"

    HTML_OUTPUT: "nmap-report.html"

    LIBXSLT_VERSION: "1.1.34-r0"

  script:

    - apk add --no-cache libxslt

    - apk add --no-cache "libxslt=${LIBXSLT_VERSION}"

    - if [[ ! -z ${NMAP_SCRIPTS} ]]; then

    -   NMAP_OPTIONS="--script=${NMAP_SCRIPTS} ${NMAP_OPTIONS}"

    - fi