Merge "Run metadata-json-lint test in lint job"

.zuul.yaml

@@ -410,7 +410,6 @@
     irrelevant-files:
       - ^doc/.*$
       - ^etc/.*$
-      - ^metadata.json$
       - ^releasenotes/.*$
       - ^requirements.txt$
       - ^test-requirements.txt$

playbooks/run-lint-tests.yaml

@@ -22,11 +22,18 @@
             gem install bundler --no-rdoc --no-ri --verbose
             $GEM_HOME/bin/bundle install --without system_tests --retry 3
             $GEM_HOME/bin/bundle exec rake lint 2>&1
+            if [ -f metadata.json ]; then
+              $GEM_HOME/bin/bundle exec rake metadata_lint 2>&1
+            fi
           else
             gem install rake -n ./.bundled_gems/
             gem install puppet-lint
+            gem install metadata-json-lint -n ./.bundled_gems/ --no-ri --no-rdoc
             gem install puppetlabs_spec_helper
             ./.bundled_gems/rake lint 2>&1
+            if [ -f metadata.json ]; then
+              ./.bundled_gems/metadata-json-lint
+            fi
           fi
         chdir: '{{ ansible_user_dir }}/workspace'
       environment: '{{ zuul | zuul_legacy_vars }}'