Merge branch 'main' into bad-login-endpoint

Author: vlussenburg

.github/workflows/mapi.yml

@@ -20,6 +20,7 @@ jobs:
       uses: actions/setup-python@v4
       with:
         python-version: 3.8
+
     - name: Install dependencies
       run: pip install -r requirements.txt
 
@@ -41,6 +42,10 @@ jobs:
         sarif-report: mapi.sarif
         html-report: mapi.html
 
+    # Kill python if it's still running, ignoring any errors
+    - name: Shut down API
+      run: pgrep python3 | xargs kill || true
+
     # Archive HTML report
     - name: Archive Mayhem for API report
       uses: actions/upload-artifact@v3

.gitlab-ci.yml

@@ -10,6 +10,8 @@ test-job:
     - curl -Lo mapi https://mayhem4api.forallsecure.com/downloads/cli/latest/linux-musl/mapi && chmod +x mapi
     - ./mapi login $MAPI_TOKEN
     - ./mapi run forallsecure-mapi-action-examples auto "http://localhost:8000/openapi.json" --url "http://localhost:8000/" --junit junit.xml --sarif mapi.sarif --html mapi.html
+    # Kill python if it's still runner, ignoring any errors
+    - pgrep python3 | xargs kill || true
   artifacts:
     when: always
     paths:

Jenkinsfile

@@ -23,6 +23,8 @@ pipeline {
                 sh '''
                       ./mapi run forallsecure-mapi-action-examples auto "http://localhost:8000/openapi.json" --url "http://localhost:8000/" --junit junit.xml --sarif mapi.sarif --html mapi.html
                    '''
+                /* Kill python if it's still running, ignoring any errors */
+                sh 'pgrep python3 | xargs kill || true'
             }
             post {
                 always {