Skip to content

Commit

Permalink
Merge pull request #124 from Segate-ekb/feature/dt_load
Browse files Browse the repository at this point in the history
Загрузка базы-эталона из DT или 1CD
  • Loading branch information
nixel2007 authored Aug 30, 2024
2 parents a5613f4 + 7f9bf6b commit 38dae8e
Show file tree
Hide file tree
Showing 24 changed files with 447 additions and 197 deletions.
4 changes: 2 additions & 2 deletions .github/workflows/gradle.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,10 @@ jobs:

steps:
- uses: actions/checkout@v4
- name: Set up JDK 11
- name: Set up JDK 17
uses: actions/setup-java@v4
with:
java-version: '11'
java-version: '17'
distribution: 'temurin'
- name: Setup Gradle
uses: gradle/actions/setup-gradle@v4
Expand Down
3 changes: 3 additions & 0 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
{
"java.compile.nullAnalysis.mode": "automatic"
}
22 changes: 21 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -198,7 +198,7 @@ pipeline1C()
"name": "ИмяРасширения1",
"initMethod": "fromSource",
"path": "путь/до/исходников/расширения",
"stages": ['bdd', 'yaxunit']
"stages": ["bdd", "yaxunit"]
},
{
"name": "ИмяРасширения2",
Expand All @@ -208,6 +208,26 @@ pipeline1C()
]
}
```
## Загрузка эталонной базы

Реализована возможность загрузки эталонной базы на этапе инициализации информационной базы. Для этого необходимо указать в конфигурационном файле параметр `initInfobase` -> `templateDBPath`:

```json
"initInfobase": {
"templateDBPath": "путь/до/файла/базы.dt"
}
```

* Поддерживается загрузка файлов формата `.dt` и `.1CD`.
* Путь к файлу базы может быть как локальным, так и удаленным (URL).
* После загрузки базы для инициализации будет использоваться файл настроек `vanessa-runner` (включая логин и пароль от ИБ), указанный в параметре `initInfobase` -> `vrunnerSettings`. По умолчанию используется файл `tools/vrunner.json`.

```json
"initInfobase": {
"templateDBPath": "путь/до/файла/базы.dt",
"vrunnerSettings": "tools/vrunner.json"
}
```

## Настройка шага YAXUnit

Expand Down
2 changes: 2 additions & 0 deletions build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -54,6 +54,8 @@ dependencies {
testImplementation("org.slf4j", "slf4j-simple", slf4jVersion)

// integration-tests
integrationTestImplementation("org.jenkins-ci.main", "jenkins-test-harness", "2254.vcff7a_d4969e5")

integrationTestImplementation("org.spockframework", "spock-core", spockVersion)
integrationTestImplementation("org.codehaus.groovy", "groovy-all", groovyVersion)

Expand Down
Binary file modified gradle/wrapper/gradle-wrapper.jar
Binary file not shown.
3 changes: 2 additions & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-6.3-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.6.1-bin.zip
networkTimeout=10000
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
Loading

0 comments on commit 38dae8e

Please sign in to comment.