diff --git a/.gitignore b/.gitignore index 31eb1bd42cf503a2f83294bdc0c890aa63f3e418..086453b02d6c62843ccb976bbeac9ebf476e8ff1 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,6 @@ debian/src/ debian/minerva* debian/src/*.sql /bin/ + +#rpm build files +rpm/rpmbuildtemp/ diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index bb1054aa42ed119dc0e20871c22b76d51d65205a..7c03244a965ece94ed31056de5d5929b93805aa5 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -444,7 +444,7 @@ rpmlint: - tags script: - yum -y install rpmlint - - rpmlint rpm/rpmbuildtemp/RPMS/noarch/minerva-*.rpm + - rpmlint -f rpm/rpmlint.config rpm/rpmbuildtemp/RPMS/noarch/minerva-*.rpm test_deploy_with_db_without_superadmin_rights: image: tomcat:8-jre8 diff --git a/rpm/rpmlint.config b/rpm/rpmlint.config new file mode 100644 index 0000000000000000000000000000000000000000..2c164b85ef00400bfcb0587747588993b028165e --- /dev/null +++ b/rpm/rpmlint.config @@ -0,0 +1 @@ +addFilter("E: dir-or-file-in-opt")