Skip to content

slapos
slapos
Commit b1d931cd authored by Jérome Perrin's avatar Jérome Perrin
Browse files
Options

chromium,firefox,seleniumserver: update chromium and firefox versions 

drop versions not running on debian 12 and add new versions
parent 9b0ab291
Pipeline #31923 failed with stage
    Hide whitespace changes
    Inline Side-by-side
    Showing with 82 additions and 151 deletions
    component/chromedriver/buildout.cfg
    View file @ b1d931cd
    ...@@ -5,21 +5,24 @@ ...@@ -5,21 +5,24 @@
    [buildout] [buildout]
    extends = extends =
    ../chromium/buildout.cfg ../chromium/buildout.cfg
    ../nss/buildout.cfg ../glib/buildout.cfg
    ../nspr/buildout.cfg ../nspr/buildout.cfg
    ../nss/buildout.cfg
    ../pcre2/buildout.cfg
    ../xorg/buildout.cfg ../xorg/buildout.cfg
    parts = parts =
    chromedriver-wrapper chromedriver-wrapper
    [chromedriver-wrapper-120]
    <= chromedriver-wrapper
    part = chromedriver-120
    [chromedriver-wrapper-91] [chromedriver-wrapper-91]
    <= chromedriver-wrapper <= chromedriver-wrapper
    part = chromedriver-91 part = chromedriver-91
    [chromedriver-wrapper-2.41]
    <= chromedriver-wrapper
    part = chromedriver-2.41
    [chromedriver-wrapper] [chromedriver-wrapper]
    # generate a wrapper named ${:wrapper-name} setting $LD_LIBRARY_PATH # generate a wrapper named ${:wrapper-name} setting $LD_LIBRARY_PATH
    ...@@ -42,30 +45,36 @@ install = ...@@ -42,30 +45,36 @@ install =
    [chromedriver] [chromedriver]
    <= chromedriver-91 <= chromedriver-120
    [chromedriver-2.41] [chromedriver-120]
    <= chromedriver-download <= chromedriver-download
    version = 2.41 version = 120.0.6099.109
    # Supports Chrome v67-69 revision-x86_64 = 1217362
    md5sum-x86_64 = fbd8b9561575054e0e7e9cc53b680a70 generation-x86_64 = 1698717838856458
    md5sum-x86_64 = 5cb8d386f01052cfc58c80ec63477db0
    [chromedriver-91] [chromedriver-91]
    <= chromedriver-download <= chromedriver-download
    url = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_linux64.zip
    version = 91.0.4472.101 version = 91.0.4472.101
    # Supports Chrome v91
    md5sum-x86_64 = cc43ba0babbfff7f22b48165ec8e8c81 md5sum-x86_64 = cc43ba0babbfff7f22b48165ec8e8c81
    [chromedriver-download] [chromedriver-download]
    # Installs chromedriver ${version}. # Installs chromedriver ${version}.
    # This chromedriver is not usable directly, it needs a wrapper. # This chromedriver is not usable directly, it needs a wrapper.
    recipe = slapos.recipe.build:download-unpacked recipe = slapos.recipe.build:download-unpacked
    url = https://chromedriver.storage.googleapis.com/${:version}/chromedriver_${:_url}.zip
    library = library =
    ${nss:location}/lib ${glib:location}/lib
    ${nspr:location}/lib
    ${libX11:location}/lib ${libX11:location}/lib
    ${libXau:location}/lib
    ${libxcb:location}/lib
    ${libXdmcp:location}/lib
    ${nspr:location}/lib
    ${nss:location}/lib
    ${pcre2:location}/lib
    [chromedriver-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu'] [chromedriver-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
    _url = linux64 url = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision-x86_64}%2Fchromedriver_linux64.zip?generation=${:generation-x86_64}&alt=media
    md5sum = ${:md5sum-x86_64} md5sum = ${:md5sum-x86_64}
    component/chromium/buildout.cfg
    View file @ b1d931cd
    ...@@ -65,36 +65,35 @@ install = ...@@ -65,36 +65,35 @@ install =
    )) ))
    os.fchmod(f.fileno(), 0o755) os.fchmod(f.fileno(), 0o755)
    [chromium-wrapper-120]
    <= chromium-wrapper
    part = chromium-120
    [chromium-wrapper-91] [chromium-wrapper-91]
    <= chromium-wrapper <= chromium-wrapper
    part = chromium-91 part = chromium-91
    [chromium-wrapper-69] [chromium]
    <= chromium-wrapper <= chromium-120
    part = chromium-69
    [chromium-120]
    <= chromium-download
    version = 120.0.6099.109
    revision-x86_64 = 1217362
    md5sum-x86_64 = 86719e40f3d33f1b421d073bb4a71f41
    generation-x86_64 = 1698717835110888
    [chromium]
    <= chromium-91
    [chromium-91] [chromium-91]
    <= chromium-download <= chromium-download
    version = 91.0.4472.114 version = 91.0.4472.114
    revision_x86-64 = 870763 revision-x86_64 = 870763
    md5sum-x86_64 = 74eab41580469c2b8117cf396db823cb md5sum-x86_64 = 74eab41580469c2b8117cf396db823cb
    generation-x86_64 = 1617926496067901 generation-x86_64 = 1617926496067901
    [chromium-69]
    <= chromium-download
    version = 69.0.3497.0
    revision_x86-64 = 576753
    md5sum-x86_64 = 08ac27fd40ace4ca8dfbd1db403deccb
    generation-x86_64 = 1532051976706023
    [chromium-download] [chromium-download]
    # macro to download a binary build of chromium and generate a # macro to download a binary build of chromium and generate a
    # wrapper as chrome-slapos in the part directory # wrapper as chrome-slapos in the part directory
    ...@@ -148,5 +147,5 @@ path = ...@@ -148,5 +147,5 @@ path =
    ${fontconfig:location}/bin ${fontconfig:location}/bin
    [chromium-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu'] [chromium-download:getattr(sys,'_multiarch',None)=='x86_64-linux-gnu']
    url = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision_x86-64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media url = https://www.googleapis.com/download/storage/v1/b/chromium-browser-snapshots/o/Linux_x64%2F${:revision-x86_64}%2Fchrome-linux.zip?generation=${:generation-x86_64}&alt=media
    md5sum = ${:md5sum-x86_64} md5sum = ${:md5sum-x86_64}
    component/firefox/buildout.cfg
    View file @ b1d931cd
    ...@@ -61,17 +61,9 @@ install = ...@@ -61,17 +61,9 @@ install =
    <= firefox-wrapper <= firefox-wrapper
    part = firefox-115 part = firefox-115
    [firefox-wrapper-78] [firefox-wrapper-102]
    <= firefox-wrapper <= firefox-wrapper
    part = firefox-78 part = firefox-102
    [firefox-wrapper-68]
    <= firefox-wrapper
    part = firefox-68
    [firefox-wrapper-60]
    <= firefox-wrapper
    part = firefox-60
    [firefox-default-fonts-conf] [firefox-default-fonts-conf]
    recipe = slapos.recipe.template:jinja2 recipe = slapos.recipe.template:jinja2
    ...@@ -103,23 +95,12 @@ version = 115.3.1esr ...@@ -103,23 +95,12 @@ version = 115.3.1esr
    i686-md5sum = f0df1b5cce1edd65addc823da02f9488 i686-md5sum = f0df1b5cce1edd65addc823da02f9488
    x86_64-md5sum = 910c0786459cf1e4dc214e6402d0633e x86_64-md5sum = 910c0786459cf1e4dc214e6402d0633e
    [firefox-78] [firefox-102]
    <= firefox-download <= firefox-download
    version = 78.1.0esr version = 102.15.1esr
    i686-md5sum = 09595a1b9a99d17a618a51bc1f971e5e i686-md5sum = 418b51b3553e98070998fcdbc344487d
    x86_64-md5sum = 06f4d488721ce7229d9a86cb4c6786f3 x86_64-md5sum = ff477480d34e44fbd0040c32ed905aaf
    [firefox-68]
    <= firefox-download
    version = 68.0.2esr
    i686-md5sum = eaa9e0246eb2a31ccf55c100dc2edd5a
    x86_64-md5sum = d22dc17ce0949cdff78009afca6f2043
    [firefox-60]
    <= firefox-download
    version = 60.0.2esr
    i686-md5sum = ce7c80716036dfb5c2fb1ca2538556ff
    x86_64-md5sum = 6fe25d9a3fcc82670320242c9047d1da
    [firefox-download] [firefox-download]
    recipe = slapos.recipe.build recipe = slapos.recipe.build
    ...@@ -199,18 +180,6 @@ version = 0.33.0 ...@@ -199,18 +180,6 @@ version = 0.33.0
    i686-md5sum = c4a9e6c92dc493f25c8d390f1c6fb11c i686-md5sum = c4a9e6c92dc493f25c8d390f1c6fb11c
    x86_64-md5sum = 563c82cfbb21478450e1c828e3730b10 x86_64-md5sum = 563c82cfbb21478450e1c828e3730b10
    [geckodriver-0.24.0]
    <= geckodriver-base
    version = 0.24.0
    i686-md5sum = b88eee754f6c90b01f760f7a453dda95
    x86_64-md5sum = 7552b85e43973c84763e212af7cca566
    [geckodriver-0.22.0]
    <= geckodriver-base
    version = 0.22.0
    i686-md5sum = 6de7544753fda56fbaa8382dcac99aaa
    x86_64-md5sum = 81746200ce5841e00cabf3b8ea7db542
    [geckodriver-base] [geckodriver-base]
    # Installs geckodriver ${version} # Installs geckodriver ${version}
    recipe = slapos.recipe.build recipe = slapos.recipe.build
    ......
    software/seleniumserver/buildout.hash.cfg
    View file @ b1d931cd
    ...@@ -19,4 +19,4 @@ md5sum = 10e19df182c692b71ea552da183a0bcf ...@@ -19,4 +19,4 @@ md5sum = 10e19df182c692b71ea552da183a0bcf
    [template-selenium] [template-selenium]
    filename = instance-selenium.cfg.in filename = instance-selenium.cfg.in
    md5sum = 39e64f252b7b55987a7e9192773994c1 md5sum = 5a7abfff9f9d7898620f8c7fc1e6f488
    \ No newline at end of file
    software/seleniumserver/instance-selenium.cfg.in
    View file @ b1d931cd
    ...@@ -92,26 +92,15 @@ environment = ...@@ -92,26 +92,15 @@ environment =
    PATH=${buildout:bin-directory} PATH=${buildout:bin-directory}
    XORG_LOCK_DIR=$${directory:tmp} XORG_LOCK_DIR=$${directory:tmp}
    DISPLAY=$${xvfb-instance:display} DISPLAY=$${xvfb-instance:display}
    LC_ALL=C.UTF8
    FONTCONFIG_FILE=$${fontconfig-conf:output} FONTCONFIG_FILE=$${fontconfig-conf:output}
    hostname = $${slap-configuration:ipv4-random} hostname = $${slap-configuration:ipv4-random}
    [selenium-server-node-instance-firefox-60] [selenium-server-node-instance-firefox-102]
    <= selenium-server-node-instance <= selenium-server-node-instance
    capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-60:version},firefox_binary=${firefox-wrapper-60:location} capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-102:version},firefox_binary=${firefox-wrapper-102:location}
    java-args = -Dwebdriver.gecko.driver=${geckodriver-0.22.0:location} java-args = -Dwebdriver.gecko.driver=${geckodriver-0.33.0:location}
    port = 7777
    [selenium-server-node-instance-firefox-68]
    <= selenium-server-node-instance
    capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-68:version},firefox_binary=${firefox-wrapper-68:location}
    java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
    port = 7778
    [selenium-server-node-instance-firefox-78]
    <= selenium-server-node-instance
    capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX,version=${firefox-78:version},firefox_binary=${firefox-wrapper-78:location}
    java-args = -Dwebdriver.gecko.driver=${geckodriver-0.24.0:location}
    port = 7779 port = 7779
    [selenium-server-node-instance-firefox-115] [selenium-server-node-instance-firefox-115]
    ...@@ -120,18 +109,17 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX ...@@ -120,18 +109,17 @@ capabilities = browserName=firefox,maxInstances=3,marionette=true,platform=LINUX
    java-args = -Dwebdriver.gecko.driver=${geckodriver-0.33.0:location} java-args = -Dwebdriver.gecko.driver=${geckodriver-0.33.0:location}
    port = 7780 port = 7780
    [selenium-server-node-instance-chromium-69]
    <= selenium-server-node-instance
    capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-69:version},chrome_binary=${chromium-wrapper-69:location}
    java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-2.41:location}
    port = 7781
    [selenium-server-node-instance-chromium-91] [selenium-server-node-instance-chromium-91]
    <= selenium-server-node-instance <= selenium-server-node-instance
    capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-91:version},chrome_binary=${chromium-wrapper-91:location} capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-91:version},chrome_binary=${chromium-wrapper-91:location}
    java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-91:location} java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-91:location}
    port = 7782 port = 7781
    [selenium-server-node-instance-chromium-120]
    <= selenium-server-node-instance
    capabilities = browserName=chrome,maxInstances=3,platform=LINUX,version=${chromium-120:version},chrome_binary=${chromium-wrapper-120:location}
    java-args = -Dwebdriver.chrome.driver=${chromedriver-wrapper-120:location}
    port = 7782
    [selenium-server-admin-password] [selenium-server-admin-password]
    recipe = slapos.cookbook:generate.password recipe = slapos.cookbook:generate.password
    ...@@ -300,12 +288,10 @@ instance-promises = ...@@ -300,12 +288,10 @@ instance-promises =
    $${selenium-server-frontend-listen-promise:name} $${selenium-server-frontend-listen-promise:name}
    $${selenium-server-hub-listen-promise:name} $${selenium-server-hub-listen-promise:name}
    $${selenium-server-hub-nodes-registered-promise:name} $${selenium-server-hub-nodes-registered-promise:name}
    $${selenium-server-node-firefox-60-listen-promise:name} $${selenium-server-node-firefox-102-listen-promise:name}
    $${selenium-server-node-firefox-68-listen-promise:name}
    $${selenium-server-node-firefox-78-listen-promise:name}
    $${selenium-server-node-firefox-115-listen-promise:name} $${selenium-server-node-firefox-115-listen-promise:name}
    $${selenium-server-node-instance-chromium-69-listen-promise:name}
    $${selenium-server-node-instance-chromium-91-listen-promise:name} $${selenium-server-node-instance-chromium-91-listen-promise:name}
    $${selenium-server-node-instance-chromium-120-listen-promise:name}
    [check-port-listening-promise] [check-port-listening-promise]
    ...@@ -335,8 +321,8 @@ promise = check_command_execute ...@@ -335,8 +321,8 @@ promise = check_command_execute
    name = $${:_buildout_section_name_}.py name = $${:_buildout_section_name_}.py
    config-command = config-command =
    $${selenium-server-check-nodes-registered:output} $${selenium-server-hub-instance:api-url} $${:expected-node-count} $${selenium-server-check-nodes-registered:output} $${selenium-server-hub-instance:api-url} $${:expected-node-count}
    # We have 6 nodes with 3 slots each # We have 4 nodes with 3 slots each
    expected-node-count = 18 expected-node-count = 12
    [selenium-server-check-nodes-registered] [selenium-server-check-nodes-registered]
    recipe = slapos.recipe.template recipe = slapos.recipe.template
    ...@@ -350,36 +336,25 @@ inline = ...@@ -350,36 +336,25 @@ inline =
    sys.exit(0 if expected_node_count == actual_node_count else 1) sys.exit(0 if expected_node_count == actual_node_count else 1)
    [selenium-server-node-firefox-60-listen-promise] [selenium-server-node-firefox-102-listen-promise]
    <= check-port-listening-promise <= check-port-listening-promise
    config-host = $${selenium-server-node-instance-firefox-60:hostname} config-host = $${selenium-server-node-instance-firefox-102:hostname}
    config-port = $${selenium-server-node-instance-firefox-60:port} config-port = $${selenium-server-node-instance-firefox-102:port}
    [selenium-server-node-firefox-68-listen-promise]
    <= check-port-listening-promise
    config-host = $${selenium-server-node-instance-firefox-68:hostname}
    config-port = $${selenium-server-node-instance-firefox-68:port}
    [selenium-server-node-firefox-78-listen-promise]
    <= check-port-listening-promise
    config-host = $${selenium-server-node-instance-firefox-78:hostname}
    config-port = $${selenium-server-node-instance-firefox-78:port}
    [selenium-server-node-firefox-115-listen-promise] [selenium-server-node-firefox-115-listen-promise]
    <= check-port-listening-promise <= check-port-listening-promise
    config-host = $${selenium-server-node-instance-firefox-115:hostname} config-host = $${selenium-server-node-instance-firefox-115:hostname}
    config-port = $${selenium-server-node-instance-firefox-115:port} config-port = $${selenium-server-node-instance-firefox-115:port}
    [selenium-server-node-instance-chromium-69-listen-promise]
    <= check-port-listening-promise
    config-host = $${selenium-server-node-instance-chromium-69:hostname}
    config-port = $${selenium-server-node-instance-chromium-69:port}
    [selenium-server-node-instance-chromium-91-listen-promise] [selenium-server-node-instance-chromium-91-listen-promise]
    <= check-port-listening-promise <= check-port-listening-promise
    config-host = $${selenium-server-node-instance-chromium-91:hostname} config-host = $${selenium-server-node-instance-chromium-91:hostname}
    config-port = $${selenium-server-node-instance-chromium-91:port} config-port = $${selenium-server-node-instance-chromium-91:port}
    [selenium-server-node-instance-chromium-120-listen-promise]
    <= check-port-listening-promise
    config-host = $${selenium-server-node-instance-chromium-120:hostname}
    config-port = $${selenium-server-node-instance-chromium-120:port}
    [publish-connection-parameter] [publish-connection-parameter]
    recipe = slapos.cookbook:publish recipe = slapos.cookbook:publish
    ......
    software/seleniumserver/software.cfg
    View file @ b1d931cd
    ...@@ -64,15 +64,7 @@ install = ...@@ -64,15 +64,7 @@ install =
    dst = os.path.join(location, 'fonts', os.path.basename(extra_font_dir)) dst = os.path.join(location, 'fonts', os.path.basename(extra_font_dir))
    os.symlink(extra_font_dir, dst) os.symlink(extra_font_dir, dst)
    [firefox-60] [firefox-102]
    post-install =
    ${symlink-extra-fonts-to-firefox-fonts-dir:install}
    [firefox-68]
    post-install =
    ${symlink-extra-fonts-to-firefox-fonts-dir:install}
    [firefox-78]
    post-install = post-install =
    ${symlink-extra-fonts-to-firefox-fonts-dir:install} ${symlink-extra-fonts-to-firefox-fonts-dir:install}
    ......
    software/seleniumserver/test/test.py
    View file @ b1d931cd
    ...@@ -282,12 +282,12 @@ class TestBrowserSelection(WebServerMixin, SeleniumServerTestCase): ...@@ -282,12 +282,12 @@ class TestBrowserSelection(WebServerMixin, SeleniumServerTestCase):
    webdriver_url = parameter_dict['backend-url'] webdriver_url = parameter_dict['backend-url']
    desired_capabilities = DesiredCapabilities.FIREFOX.copy() desired_capabilities = DesiredCapabilities.FIREFOX.copy()
    desired_capabilities['version'] = '60.0.2esr' desired_capabilities['version'] = '102.15.1esr'
    driver = webdriver.Remote( driver = webdriver.Remote(
    command_executor=webdriver_url, command_executor=webdriver_url,
    desired_capabilities=desired_capabilities) desired_capabilities=desired_capabilities)
    self.assertIn( self.assertIn(
    'Gecko/20100101 Firefox/60.0', 'Gecko/20100101 Firefox/102.0',
    driver.execute_script('return navigator.userAgent')) driver.execute_script('return navigator.userAgent'))
    driver.quit() driver.quit()
    desired_capabilities['version'] = '115.3.1esr' desired_capabilities['version'] = '115.3.1esr'
    ...@@ -409,31 +409,18 @@ class TestSSHServer(SeleniumServerTestCase): ...@@ -409,31 +409,18 @@ class TestSSHServer(SeleniumServerTestCase):
    self.assertIn(b"Welcome to SlapOS Selenium Server.", received) self.assertIn(b"Welcome to SlapOS Selenium Server.", received)
    class TestFirefox60( class TestFirefox102(
    BrowserCompatibilityMixin, BrowserCompatibilityMixin,
    SeleniumServerTestCase, SeleniumServerTestCase,
    ImageComparisonTestCase, ImageComparisonTestCase,
    ): ):
    desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='60.0.2esr') desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='102.15.1esr')
    user_agent = 'Gecko/20100101 Firefox/60.0' user_agent = 'Gecko/20100101 Firefox/102.0'
    # resizing window does not work, but we don't really depend on it
    class TestFirefox68( @unittest.expectedFailure
    BrowserCompatibilityMixin, def test_resize_window(self):
    SeleniumServerTestCase, super().test_resize_window()
    ImageComparisonTestCase,
    ):
    desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='68.0.2esr')
    user_agent = 'Gecko/20100101 Firefox/68.0'
    class TestFirefox78(
    BrowserCompatibilityMixin,
    SeleniumServerTestCase,
    ImageComparisonTestCase,
    ):
    desired_capabilities = dict(DesiredCapabilities.FIREFOX, version='78.1.0esr')
    user_agent = 'Gecko/20100101 Firefox/78.0'
    class TestFirefox115( class TestFirefox115(
    ...@@ -450,19 +437,19 @@ class TestFirefox115( ...@@ -450,19 +437,19 @@ class TestFirefox115(
    super().test_resize_window() super().test_resize_window()
    class TestChrome69( class TestChrome91(
    BrowserCompatibilityMixin, BrowserCompatibilityMixin,
    SeleniumServerTestCase, SeleniumServerTestCase,
    ImageComparisonTestCase, ImageComparisonTestCase,
    ): ):
    desired_capabilities = dict(DesiredCapabilities.CHROME, version='69.0.3497.0') desired_capabilities = dict(DesiredCapabilities.CHROME, version='91.0.4472.114')
    user_agent = 'Chrome/69.0.3497.0' user_agent = 'Chrome/91.0.4472.0'
    class TestChrome91( class TestChrome120(
    BrowserCompatibilityMixin, BrowserCompatibilityMixin,
    SeleniumServerTestCase, SeleniumServerTestCase,
    ImageComparisonTestCase, ImageComparisonTestCase,
    ): ):
    desired_capabilities = dict(DesiredCapabilities.CHROME, version='91.0.4472.114') desired_capabilities = dict(DesiredCapabilities.CHROME, version='120.0.6099.109')
    user_agent = 'Chrome/91.0.4472.0' user_agent = 'Chrome/120.0.0.0'
    Markdown is supported
    0% or
    You are about to add 0 people to the discussion. Proceed with caution.
    Finish editing this message first!
    Please register or to comment
    GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7