Merge branch 'dev' into 'master'

dev

See merge request oda-alexandre/android-studio!40

.gitlab-ci.yml

@@ -64,35 +64,35 @@ container_scanning:
   only:
     - dev
 
-sast:
-  stage: test
-  allow_failure: false
-  script:
-    - echo -e '\033[36;1m ******* SAST ******** \033[0m'
-    - export SP_VERSION=$(echo "${CI_SERVER_VERSION}" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run --rm
-        --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
-        --volume ${PWD}:/code
-        --volume /var/run/docker.sock:/var/run/docker.sock
-        "registry.gitlab.com/gitlab-org/security-products/sast:${SP_VERSION}" /app/bin/run /code
-  artifacts:
-    paths: [gl-sast-report.json]
-  only:
-    - dev
+# sast:
+#   stage: test
+#   allow_failure: false
+#   script:
+#     - echo -e '\033[36;1m ******* SAST ******** \033[0m'
+#     - export SP_VERSION=$(echo "${CI_SERVER_VERSION}" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+#     - docker run --rm
+#         --env SAST_CONFIDENCE_LEVEL="${SAST_CONFIDENCE_LEVEL:-3}"
+#         --volume ${PWD}:/code
+#         --volume /var/run/docker.sock:/var/run/docker.sock
+#         "registry.gitlab.com/gitlab-org/security-products/sast:${SP_VERSION}" /app/bin/run /code
+#   artifacts:
+#     paths: [gl-sast-report.json]
+#   only:
+#     - dev
 
-license_management:
-  stage: test
-  allow_failure: false
-  script:
-    - echo -e '\033[36;1m ******* LICENSE MANAGEMENT ******** \033[0m'
-    - export LICENSE_MANAGEMENT_VERSION=$(echo "${CI_SERVER_VERSION}" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
-    - docker run --rm
-        --volume ${PWD}:/code
-        "registry.gitlab.com/gitlab-org/security-products/license-management:${LICENSE_MANAGEMENT_VERSION}" analyze /code
-  artifacts:
-    paths: [gl-license-management-report.json]
-  only:
-    - dev
+# license_management:
+#   stage: test
+#   allow_failure: false
+#   script:
+#     - echo -e '\033[36;1m ******* LICENSE MANAGEMENT ******** \033[0m'
+#     - export LICENSE_MANAGEMENT_VERSION=$(echo "${CI_SERVER_VERSION}" | sed 's/^\([0-9]*\)\.\([0-9]*\).*/\1-\2-stable/')
+#     - docker run --rm
+#         --volume ${PWD}:/code
+#         "registry.gitlab.com/gitlab-org/security-products/license-management:${LICENSE_MANAGEMENT_VERSION}" analyze /code
+#   artifacts:
+#     paths: [gl-license-management-report.json]
+#   only:
+#     - dev
 
 test_app:
   stage: test