Commit be175c5
authored
Schema fix (#3671)
* Fix import of molecule schema.
Commit "Adopt molecule config JSON schema (#3668)" (acb9ae0)
has imported the molecule schema into data/ but everything is using
src/molecule/schemas/ as directory for the schema.
So:
- Update src/molecule/data/molecule.json with parts of
src/molecule/schemas/molecule.json content with the one. The update/
replacement was partial as the local schema handles in a better way
the MoleculeDependencyModel. The new schema was allowing to use the
"shell" dependency with an empty command.
- Update schema $id to point to the correct location
- Fix test link to point to the correct schema file.
- Fix path to the schema in schema_v3.py
Signed-off-by: Arnaud Patard <apatard@hupstream.com>
* rc/molecule/test/unit/model/v2/test_dependency_section.py: Fix checks
With the new schema file, the schema check doesn't return the same
error strings, so update them.
Signed-off-by: Arnaud Patard <apatard@hupstream.com>
Signed-off-by: Arnaud Patard <apatard@hupstream.com>1 parent acb9ae0 commit be175c5
6 files changed
Lines changed: 18 additions & 551 deletions
File tree
- src/molecule
- data
- model
- schemas
- test/unit/model/v2
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
| 1 | + | |
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
13 | 13 | | |
14 | 14 | | |
15 | 15 | | |
16 | | - | |
| 16 | + | |
17 | 17 | | |
18 | | - | |
19 | | - | |
20 | | - | |
21 | | - | |
22 | 18 | | |
23 | 19 | | |
24 | 20 | | |
| |||
38 | 34 | | |
39 | 35 | | |
40 | 36 | | |
| 37 | + | |
| 38 | + | |
| 39 | + | |
| 40 | + | |
| 41 | + | |
| 42 | + | |
| 43 | + | |
| 44 | + | |
| 45 | + | |
| 46 | + | |
| 47 | + | |
41 | 48 | | |
42 | 49 | | |
43 | 50 | | |
| |||
509 | 516 | | |
510 | 517 | | |
511 | 518 | | |
512 | | - | |
| 519 | + | |
513 | 520 | | |
514 | 521 | | |
515 | 522 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
25 | 25 | | |
26 | 26 | | |
27 | 27 | | |
28 | | - | |
| 28 | + | |
29 | 29 | | |
30 | 30 | | |
31 | 31 | | |
32 | 32 | | |
33 | 33 | | |
34 | | - | |
| 34 | + | |
35 | 35 | | |
36 | 36 | | |
37 | 37 | | |
| |||
This file was deleted.
0 commit comments