diff --git a/Jenkinsfile b/Jenkinsfile index b91703c..e435e7b 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -66,6 +66,7 @@ name: 'dummy-and', env: [ RELEASE: true, + TEST_SCOPE: 'none', JAVA_HOME: '/usr/java/latest', ANDROID_HOME: '/opt/android/sdk', GRADLE_USER_HOME: '/opt/android/gradle', @@ -113,7 +114,11 @@ onlyif = (! deployBranches.contains(lazyConfig['branch']) ) tasks = [ run: { - fastLane('android', 'test') + if ( env.TEST_SCOPE && env.TEST_SCOPE != 'none' ) { + fastLane('android', 'test') + } else { + echo("Skipping tests") + } }, post: { junit(testResults: 'fastlane/report.xml,**/build/test-results/*/*.xml', allowEmptyResults: true) diff --git a/lazyDir/centos7.Dockerfile b/lazyDir/centos7.Dockerfile index 0580b9d..75167a0 100644 --- a/lazyDir/centos7.Dockerfile +++ b/lazyDir/centos7.Dockerfile @@ -41,16 +41,6 @@ && \ yum -q -y clean all --enablerepo='*' -# Import extra GPG keys -RUN rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppet && \ - rpm --import http://yum.puppetlabs.com/RPM-GPG-KEY-puppetlabs && \ - rpm --import http://yum.mariadb.org/RPM-GPG-KEY-MariaDB - -# Add internal CA -RUN wget -q https://share.qiy.nl/public/certs/ca-digital-me-private-2026.crt -O /etc/pki/ca-trust/source/anchors/ca-digital-me-internal.pem && \ - update-ca-trust force-enable && \ - update-ca-trust extract - # Enable Software Collections RUN yum -q clean expire-cache && \ yum -q makecache && \