Backed out changeset 78ac10622294 (bug 1330253) for firefox ui test failures a=backout

testing/firefox-ui/tests/functional/security/manifest.ini

@@ -10,7 +10,6 @@ tags = local
 [test_no_certificate.py]
 tags = local
 [test_safe_browsing_initial_download.py]
-skip-if = debug # the GAPI key isn't available in debug builds
 [test_safe_browsing_notification.py]
 [test_safe_browsing_warning_pages.py]
 [test_security_notification.py]

testing/firefox-ui/tests/functional/security/test_safe_browsing_initial_download.py

@@ -33,7 +33,9 @@ class TestSafeBrowsingInitialDownload(PuppeteerMixin, MarionetteTestCase):
 
     prefs_provider_update_time = {
         # Force an immediate download of the safebrowsing files
-        'browser.safebrowsing.provider.google4.nextupdatetime': 1,
+        # Bug 1330253 - Leave the next line disabled until we have google API key
+        #               on the CI machines.
+        # 'browser.safebrowsing.provider.google4.nextupdatetime': 1,
         'browser.safebrowsing.provider.google.nextupdatetime': 1,
         'browser.safebrowsing.provider.mozilla.nextupdatetime': 1,
     }
@@ -46,6 +48,9 @@ class TestSafeBrowsingInitialDownload(PuppeteerMixin, MarionetteTestCase):
         'browser.safebrowsing.malware.enabled': True,
         'privacy.trackingprotection.enabled': True,
         'privacy.trackingprotection.pbmode.enabled': True,
+        'urlclassifier.malwareTable':
+        'goog-malware-shavar,goog-unwanted-shavar,test-malware-simple,test-unwanted-simple',
+        'urlclassifier.phishTable': 'googpub-phish-shavar,test-phish-simple',
     }
 
     def get_safebrowsing_files(self, is_v4):
@@ -75,7 +80,10 @@ class TestSafeBrowsingInitialDownload(PuppeteerMixin, MarionetteTestCase):
         self.safebrowsing_path = os.path.join(self.marionette.instance.profile.profile,
                                               'safebrowsing')
         self.safebrowsing_v2_files = self.get_safebrowsing_files(False)
-        self.safebrowsing_v4_files = self.get_safebrowsing_files(True)
+        # Bug 1330253 - Leave the next line disabled until we have google API key
+        #               on the CI machines.
+        # self.safebrowsing_v4_files = self.get_safebrowsing_files(True)
+        self.safebrowsing_v4_files = []
 
     def tearDown(self):
         try:

testing/mozharness/configs/builds/releng_base_linux_32_builds.py

@@ -47,7 +47,7 @@ config = {
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
-         'min_scm_level': 1},
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},

testing/mozharness/configs/builds/releng_base_linux_64_builds.py

@@ -46,7 +46,7 @@ config = {
     'secret_files': [
         {'filename': '/builds/gapi.data',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/gapi.data',
-         'min_scm_level': 1},
+         'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},
         {'filename': '/builds/mozilla-desktop-geoloc-api.key',
          'secret_name': 'project/releng/gecko/build/level-%(scm-level)s/mozilla-desktop-geoloc-api.key',
          'min_scm_level': 2, 'default': 'try-build-has-no-secrets'},

testing/mozharness/mozharness/mozilla/secrets.py

@@ -57,7 +57,7 @@ class SecretsMixin(object):
             filename = sf['filename']
             secret_name = sf['secret_name'] % subst
             min_scm_level = sf.get('min_scm_level', 0)
-            if scm_level < min_scm_level:
+            if scm_level <= min_scm_level:
                 if 'default' in sf:
                     self.info("Using default value for " + filename)
                     secret = sf['default']