Commit a33844a2 authored by Kirill Smelkov's avatar Kirill Smelkov

slapos-testing, slapos-sr-testing: Don't duplicate instance.cfg prologue that...

slapos-testing, slapos-sr-testing: Don't duplicate instance.cfg prologue that is already provided by stack/nxdtest/instance.cfg

This software releases switched to nxdtest in 1536ad2e (software/slapos-testing: use nxdtest)
and 3a1e5628 (software/slapos-sr-testing: use nxdtest). So there is no
longer need to duplicate that standard instance prologue that is
provided by stack/nxdtest/instance.cfg:

https://lab.nexedi.com/nexedi/slapos/blob/0803b816/stack/nxdtest/instance.cfg.in#L1-8

/reviewed-by @jerome
/reviewed-on !94
parent 78bad517
Pipeline #14373 passed with stage
......@@ -15,4 +15,4 @@
[template]
filename = instance.cfg
md5sum = 5ba23849f0b9bcfbe2534314ce7f48e8
md5sum = 5d1320a9b1d2828f2870e3096f1c2bfb
[buildout]
extends = {{ nxdtest_instance }}
parts =
runTestSuite
parts +=
publish
eggs-directory = {{ buildout['eggs-directory'] }}
develop-eggs-directory = {{ buildout['develop-eggs-directory'] }}
offline = true
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration
computer = ${slap-connection:computer-id}
......
......@@ -15,4 +15,4 @@
[template]
filename = instance.cfg
md5sum = 3b1b386f6ad4c9ac50ab1f1e1384e751
md5sum = a6091981a78cb2b10a97e431adc7615c
[buildout]
extends = ${nxdtest-instance.cfg:rendered}
parts =
runTestSuite
parts +=
publish
eggs-directory = ${buildout:eggs-directory}
develop-eggs-directory = ${buildout:develop-eggs-directory}
offline = true
[slap-configuration]
recipe = slapos.cookbook:slapconfiguration
computer = $${slap-connection:computer-id}
......
  • This commit may have broken slapos.cookbook test line in SlapOS.Eggs.UnitTest-Master.Python2. Can you check ?

  • @jm, thanks for heads up. I will try to check.

  • @jerome, FYI I've tried to analyze what is going on here but felt asleep at Sunday evening... I will continue to debug tomorrow...

  • Thanks ! this must be related to https://lab.nexedi.com/nexedi/slapos/blob/a95514021a47aa10d793174d06e85123f0905357/slapos/test/utils.py this code parses buildout.cfg so that tests for recipe installing eggs reuse the eggs already installed by buildout, instead of installing eggs again.

    This code parsed the buildout.cfg using zc.buildout.configparser.parse to get buildout:eggs-directory, but this parse function does not understand extends, so now that the option is defined in an extended profile it's not found.

    I'm thinking we can rewrite this to make software/slapos-testing set an environment variable containing egg directories to pass this value to the test instead of having the test trying to guess like this.

  • I tried this approach of using environment variables in !949 (merged)

  • @jerome, thanks a lot. I've tried !949 (merged) on my webrunner and I confirm that slapos.cookbook tests now pass with it.

  • Kirill Smelkov @kirr

    mentioned in merge request !949 (merged)

    ·

    mentioned in merge request !949 (merged)

    Toggle commit list
  • mentioned in commit 56a2d7a4

    Toggle commit list
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