Commit 74da6b6e authored by Federico Falconieri's avatar Federico Falconieri
Browse files

Merge branch 'revert-0ba33fdc' into 'master' 

Revert "Merge branch 'hoverht-master-patch-21281' into 'master'"

See merge request ci/templates!29
parents c3b0e76d ed3d278a

.gitlab-ci.yml

+16 −16
Original line number Diff line number Diff line
@@ -3,26 +3,26 @@ variables: 
  PYTHON_PACKAGE: "templates_tests/python/mypackage"



include:

  - local: 'alm/semantic-release.yml'

  - local: "alm/semantic-release.yml"



  - local: 'other/badge.yml'

  - local: "other/badge.yml"



  - local: 'docker/kaniko.yml'

  - local: 'docker/anchore/grype.yml'

  - local: "docker/kaniko.yml"

  - local: "docker/anchore/grype.yml"



  - local: 'python/bandit.yml'

  - local: 'python/black.yml'

  - local: 'python/pip-outdated.yml'

  - local: 'python/pytest.yml'

  - local: 'python/mypy.yml'

  - local: 'python/pylint.yml'

  - local: 'python/safety.yml'

  - local: 'python/wily.yml'

  - local: "python/bandit.yml"

  - local: "python/black.yml"

  - local: "python/pip-outdated.yml"

  - local: "python/pytest.yml"

  - local: "python/mypy.yml"

  - local: "python/pylint.yml"

  - local: "python/safety.yml"

  - local: "python/wily.yml"



  - local: 'c/cppcheck.yml'

  - local: 'c/flawfinder.yml'

  - local: "c/cppcheck.yml"

  - local: "c/flawfinder.yml"



  - local: 'yaml/yamllint.yml'

  - local: "yaml/yamllint.yml"



docker:kaniko:

  variables:

docker/kaniko-template.yml

+0 −2
Original line number Diff line number Diff line
@@ -41,11 +41,9 @@ 
      fi

    - printf "Will use the following destinations:${DESTINATIONS}\n" | sed 's/--destination=/\n/g'

    - /kaniko/executor --cache=${USE_CACHE} --context=${CONTEXT} --dockerfile=${DOCKERFILE} ${DESTINATIONS} ${LABELS} ${EXTRA_ARGS}

    - cat ${CONTEXT}/${DOCKERFILE}

    - |

      if [ "${PYTHON_TEST}" = "true" ]; then

        printf "\nRUN if ! python3 -m pip >/dev/null; then wget -q https://bootstrap.pypa.io/get-pip.py && python3 get-pip.py; fi" >> ${CONTEXT}/${DOCKERFILE}

        printf "\nRUN python3 -m pip install pytest pytest-cov pylint pylint_junit safety mutmut coverage" >> ${CONTEXT}/${DOCKERFILE}

        /kaniko/executor --cache=${USE_CACHE} --context=${CONTEXT} --dockerfile=${DOCKERFILE} --destination=${CI_REGISTRY_IMAGE}:${CI_COMMIT_REF_NAME}-testing ${EXTRA_ARGS}

      fi
 
    - cat ${CONTEXT}/${DOCKERFILE}

pipelines/c-basic.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ variables: 
  FLAWFINDER_ERROR_LEVEL: "3"

  DIRECTORIES: "."

include:

  - local: 'C/flawfinder.yml'

  - local: 'C/cppcheck.yml'
 
  - local: "C/flawfinder.yml"

  - local: "C/cppcheck.yml"

pipelines/python-basic.yml

+2 −2
Original line number Diff line number Diff line
@@ -3,5 +3,5 @@ variables: 
  PYLINT_THRESHOLD: "6"



include:

  - local: 'python/black.yml'

  - local: 'python/bandit.yml'
 
  - local: "python/black.yml"

  - local: "python/bandit.yml"

pipelines/python-docker-basic.yml

+7 −7
Original line number Diff line number Diff line
@@ -4,10 +4,10 @@ variables: 
  PYTEST_COVERAGE_THRESHOLD: "50"



include:

  - local: 'docker/kaniko.yml'

  - local: 'python/black.yml'

  - local: 'python/pylint.yml'

  - local: 'python/pytest.yml'

  - local: 'python/bandit.yml'

  - local: 'python/safety.yml'

  - local: 'python/semantic-release/private.yml'
 
  - local: "docker/kaniko.yml"

  - local: "python/black.yml"

  - local: "python/pylint.yml"

  - local: "python/pytest.yml"

  - local: "python/bandit.yml"

  - local: "python/safety.yml"

  - local: "python/semantic-release/private.yml"