diff --git a/.github/workflows/gradle.yml b/.github/workflows/gradle.yml index d27ea4bb..a712106c 100644 --- a/.github/workflows/gradle.yml +++ b/.github/workflows/gradle.yml @@ -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 diff --git a/.vscode/settings.json b/.vscode/settings.json new file mode 100644 index 00000000..7b016a89 --- /dev/null +++ b/.vscode/settings.json @@ -0,0 +1,3 @@ +{ + "java.compile.nullAnalysis.mode": "automatic" +} \ No newline at end of file diff --git a/README.md b/README.md index 81345d32..3018524c 100644 --- a/README.md +++ b/README.md @@ -198,7 +198,7 @@ pipeline1C() "name": "ИмяРасширения1", "initMethod": "fromSource", "path": "путь/до/исходников/расширения", - "stages": ['bdd', 'yaxunit'] + "stages": ["bdd", "yaxunit"] }, { "name": "ИмяРасширения2", @@ -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 diff --git a/build.gradle.kts b/build.gradle.kts index afd047aa..a731a1da 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -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) diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738cb..943f0cbf 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index a4b44297..50832291 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -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 diff --git a/gradlew b/gradlew index af6708ff..65dcd68d 100755 --- a/gradlew +++ b/gradlew @@ -1,78 +1,129 @@ -#!/usr/bin/env sh +#!/bin/sh + +# +# Copyright © 2015-2021 the original authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# ############################################################################## -## -## Gradle start up script for UN*X -## +# +# Gradle start up script for POSIX generated by Gradle. +# +# Important for running: +# +# (1) You need a POSIX-compliant shell to run this script. If your /bin/sh is +# noncompliant, but you have some other compliant shell such as ksh or +# bash, then to run this script, type that shell name before the whole +# command line, like: +# +# ksh Gradle +# +# Busybox and similar reduced shells will NOT work, because this script +# requires all of these POSIX shell features: +# * functions; +# * expansions «$var», «${var}», «${var:-default}», «${var+SET}», +# «${var#prefix}», «${var%suffix}», and «$( cmd )»; +# * compound commands having a testable exit status, especially «case»; +# * various built-in commands including «command», «set», and «ulimit». +# +# Important for patching: +# +# (2) This script targets any POSIX shell, so it avoids extensions provided +# by Bash, Ksh, etc; in particular arrays are avoided. +# +# The "traditional" practice of packing multiple parameters into a +# space-separated string is a well documented source of bugs and security +# problems, so this is (mostly) avoided, by progressively accumulating +# options in "$@", and eventually passing that to Java. +# +# Where the inherited environment variables (DEFAULT_JVM_OPTS, JAVA_OPTS, +# and GRADLE_OPTS) rely on word-splitting, this is performed explicitly; +# see the in-line comments for details. +# +# There are tweaks for specific operating systems such as AIX, CygWin, +# Darwin, MinGW, and NonStop. +# +# (3) This script is generated from the Groovy template +# https://github.com/gradle/gradle/blob/HEAD/subprojects/plugins/src/main/resources/org/gradle/api/internal/plugins/unixStartScript.txt +# within the Gradle project. +# +# You can find Gradle at https://github.com/gradle/gradle/. +# ############################################################################## # Attempt to set APP_HOME + # Resolve links: $0 may be a link -PRG="$0" -# Need this for relative symlinks. -while [ -h "$PRG" ] ; do - ls=`ls -ld "$PRG"` - link=`expr "$ls" : '.*-> \(.*\)$'` - if expr "$link" : '/.*' > /dev/null; then - PRG="$link" - else - PRG=`dirname "$PRG"`"/$link" - fi +app_path=$0 + +# Need this for daisy-chained symlinks. +while + APP_HOME=${app_path%"${app_path##*/}"} # leaves a trailing /; empty if no leading path + [ -h "$app_path" ] +do + ls=$( ls -ld "$app_path" ) + link=${ls#*' -> '} + case $link in #( + /*) app_path=$link ;; #( + *) app_path=$APP_HOME$link ;; + esac done -SAVED="`pwd`" -cd "`dirname \"$PRG\"`/" >/dev/null -APP_HOME="`pwd -P`" -cd "$SAVED" >/dev/null -APP_NAME="Gradle" -APP_BASE_NAME=`basename "$0"` +# This is normally unused +# shellcheck disable=SC2034 +APP_BASE_NAME=${0##*/} +APP_HOME=$( cd "${APP_HOME:-./}" && pwd -P ) || exit # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. -MAX_FD="maximum" +MAX_FD=maximum warn () { echo "$*" -} +} >&2 die () { echo echo "$*" echo exit 1 -} +} >&2 # OS specific support (must be 'true' or 'false'). cygwin=false msys=false darwin=false nonstop=false -case "`uname`" in - CYGWIN* ) - cygwin=true - ;; - Darwin* ) - darwin=true - ;; - MINGW* ) - msys=true - ;; - NONSTOP* ) - nonstop=true - ;; +case "$( uname )" in #( + CYGWIN* ) cygwin=true ;; #( + Darwin* ) darwin=true ;; #( + MSYS* | MINGW* ) msys=true ;; #( + NONSTOP* ) nonstop=true ;; esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then # IBM's JDK on AIX uses strange locations for the executables - JAVACMD="$JAVA_HOME/jre/sh/java" + JAVACMD=$JAVA_HOME/jre/sh/java else - JAVACMD="$JAVA_HOME/bin/java" + JAVACMD=$JAVA_HOME/bin/java fi if [ ! -x "$JAVACMD" ] ; then die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME @@ -81,7 +132,7 @@ Please set the JAVA_HOME variable in your environment to match the location of your Java installation." fi else - JAVACMD="java" + JAVACMD=java which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. Please set the JAVA_HOME variable in your environment to match the @@ -89,84 +140,105 @@ location of your Java installation." fi # Increase the maximum file descriptors if we can. -if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then - MAX_FD_LIMIT=`ulimit -H -n` - if [ $? -eq 0 ] ; then - if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then - MAX_FD="$MAX_FD_LIMIT" - fi - ulimit -n $MAX_FD - if [ $? -ne 0 ] ; then - warn "Could not set maximum file descriptor limit: $MAX_FD" - fi - else - warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" - fi +if ! "$cygwin" && ! "$darwin" && ! "$nonstop" ; then + case $MAX_FD in #( + max*) + # In POSIX sh, ulimit -H is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + MAX_FD=$( ulimit -H -n ) || + warn "Could not query maximum file descriptor limit" + esac + case $MAX_FD in #( + '' | soft) :;; #( + *) + # In POSIX sh, ulimit -n is undefined. That's why the result is checked to see if it worked. + # shellcheck disable=SC3045 + ulimit -n "$MAX_FD" || + warn "Could not set maximum file descriptor limit to $MAX_FD" + esac fi -# For Darwin, add options to specify how the application appears in the dock -if $darwin; then - GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" -fi +# Collect all arguments for the java command, stacking in reverse order: +# * args from the command line +# * the main class name +# * -classpath +# * -D...appname settings +# * --module-path (only if needed) +# * DEFAULT_JVM_OPTS, JAVA_OPTS, and GRADLE_OPTS environment variables. + +# For Cygwin or MSYS, switch paths to Windows format before running java +if "$cygwin" || "$msys" ; then + APP_HOME=$( cygpath --path --mixed "$APP_HOME" ) + CLASSPATH=$( cygpath --path --mixed "$CLASSPATH" ) + + JAVACMD=$( cygpath --unix "$JAVACMD" ) -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then - APP_HOME=`cygpath --path --mixed "$APP_HOME"` - CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` - JAVACMD=`cygpath --unix "$JAVACMD"` - - # We build the pattern for arguments to be converted via cygpath - ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` - SEP="" - for dir in $ROOTDIRSRAW ; do - ROOTDIRS="$ROOTDIRS$SEP$dir" - SEP="|" - done - OURCYGPATTERN="(^($ROOTDIRS))" - # Add a user-defined pattern to the cygpath arguments - if [ "$GRADLE_CYGPATTERN" != "" ] ; then - OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" - fi # Now convert the arguments - kludge to limit ourselves to /bin/sh - i=0 - for arg in "$@" ; do - CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` - CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option - - if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition - eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` - else - eval `echo args$i`="\"$arg\"" + for arg do + if + case $arg in #( + -*) false ;; # don't mess with options #( + /?*) t=${arg#/} t=/${t%%/*} # looks like a POSIX filepath + [ -e "$t" ] ;; #( + *) false ;; + esac + then + arg=$( cygpath --path --ignore --mixed "$arg" ) fi - i=$((i+1)) + # Roll the args list around exactly as many times as the number of + # args, so each arg winds up back in the position where it started, but + # possibly modified. + # + # NB: a `for` loop captures its iteration list before it begins, so + # changing the positional parameters here affects neither the number of + # iterations, nor the values presented in `arg`. + shift # remove old arg + set -- "$@" "$arg" # push replacement arg done - case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; - esac fi -# Escape application args -save () { - for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done - echo " " -} -APP_ARGS=$(save "$@") - -# Collect all arguments for the java command, following the shell quoting and substitution rules -eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" - -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" +# Collect all arguments for the java command; +# * $DEFAULT_JVM_OPTS, $JAVA_OPTS, and $GRADLE_OPTS can contain fragments of +# shell script including quotes and variable substitutions, so put them in +# double quotes to make sure that they get re-expanded; and +# * put everything else in single quotes, so that it's not re-expanded. + +set -- \ + "-Dorg.gradle.appname=$APP_BASE_NAME" \ + -classpath "$CLASSPATH" \ + org.gradle.wrapper.GradleWrapperMain \ + "$@" + +# Stop when "xargs" is not available. +if ! command -v xargs >/dev/null 2>&1 +then + die "xargs is not available" fi +# Use "xargs" to parse quoted args. +# +# With -n1 it outputs one arg per line, with the quotes and backslashes removed. +# +# In Bash we could simply go: +# +# readarray ARGS < <( xargs -n1 <<<"$var" ) && +# set -- "${ARGS[@]}" "$@" +# +# but POSIX shell has neither arrays nor command substitution, so instead we +# post-process each arg (as a line of input to sed) to backslash-escape any +# character that might be a shell metacharacter, then use eval to reverse +# that process (while maintaining the separation between arguments), and wrap +# the whole thing up as a single "set" statement. +# +# This will of course break if any of these variables contains a newline or +# an unmatched quote. +# + +eval "set -- $( + printf '%s\n' "$DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS" | + xargs -n1 | + sed ' s~[^-[:alnum:]+,./:=@_]~\\&~g; ' | + tr '\n' ' ' + )" '"$@"' + exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 0f8d5937..6689b85b 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,4 +1,20 @@ -@if "%DEBUG%" == "" @echo off +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%"=="" @echo off @rem ########################################################################## @rem @rem Gradle startup script for Windows @@ -9,19 +25,23 @@ if "%OS%"=="Windows_NT" setlocal set DIRNAME=%~dp0 -if "%DIRNAME%" == "" set DIRNAME=. +if "%DIRNAME%"=="" set DIRNAME=. +@rem This is normally unused set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome set JAVA_EXE=java.exe %JAVA_EXE% -version >NUL 2>&1 -if "%ERRORLEVEL%" == "0" goto init +if %ERRORLEVEL% equ 0 goto execute echo. echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. @@ -35,7 +55,7 @@ goto fail set JAVA_HOME=%JAVA_HOME:"=% set JAVA_EXE=%JAVA_HOME%/bin/java.exe -if exist "%JAVA_EXE%" goto init +if exist "%JAVA_EXE%" goto execute echo. echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% @@ -45,38 +65,26 @@ echo location of your Java installation. goto fail -:init -@rem Get command-line arguments, handling Windows variants - -if not "%OS%" == "Windows_NT" goto win9xME_args - -:win9xME_args -@rem Slurp the command line arguments. -set CMD_LINE_ARGS= -set _SKIP=2 - -:win9xME_args_slurp -if "x%~1" == "x" goto execute - -set CMD_LINE_ARGS=%* - :execute @rem Setup the command line set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle -"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* :end @rem End local scope for the variables with windows NT shell -if "%ERRORLEVEL%"=="0" goto mainEnd +if %ERRORLEVEL% equ 0 goto mainEnd :fail rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of rem the _cmd.exe /c_ return code! -if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 -exit /b 1 +set EXIT_CODE=%ERRORLEVEL% +if %EXIT_CODE% equ 0 set EXIT_CODE=1 +if not ""=="%GRADLE_EXIT_CONSOLE%" exit %EXIT_CODE% +exit /b %EXIT_CODE% :mainEnd if "%OS%"=="Windows_NT" endlocal diff --git a/jenkinsResources/core-version.txt b/jenkinsResources/core-version.txt index b8b8d1ea..52ee3913 100644 --- a/jenkinsResources/core-version.txt +++ b/jenkinsResources/core-version.txt @@ -1 +1 @@ -2.246 \ No newline at end of file +2.462.1 \ No newline at end of file diff --git a/resources/globalConfiguration.json b/resources/globalConfiguration.json index 693f5544..5e4399c5 100644 --- a/resources/globalConfiguration.json +++ b/resources/globalConfiguration.json @@ -28,6 +28,7 @@ "bdd": 120, "getBinaries": 60, "createInfoBase": 60, + "loadConfiguration": 60, "designerToEdtFormatTransformation": 60, "edtToDesignerFormatTransformation": 60, "edtValidate": 240, @@ -42,6 +43,8 @@ "initMethod": "fromStorage", "runMigration": true, "additionalInitializationSteps": [], + "templateDBPath": "", + "vrunnerSettings": "./tools/vrunner.json", "extensions": [] }, "bdd": { diff --git a/resources/schema.json b/resources/schema.json index 326c1e0a..58561f05 100644 --- a/resources/schema.json +++ b/resources/schema.json @@ -106,6 +106,10 @@ "type" : "integer", "description" : "Таймаут шага создания информационной базы, в минутах.\n По умолчанию содержит значение 60.\n " }, + "loadConfiguration" : { + "type" : "integer", + "description" : "Таймаут шага загрузки конфигурации в базу, в минутах.\n По умолчанию содержит значение 60.\n " + }, "initInfoBase" : { "type" : "integer", "description" : "Таймаут шага инициализации информационной базы, в минутах.\n По умолчанию содержит значение 60.\n " @@ -173,6 +177,14 @@ "type" : "string" } }, + "vrunnerSettings" : { + "type" : "string", + "description" : "Путь к конфигурационному файлу vanessa-runner.\n По умолчанию содержит значение \"./tools/vrunner.json\"\n Используется, если на этапе подготовки база загружается из эталона. \n " + }, + "templateDBPath" : { + "type" : "string", + "description" : "\n Путь к файлу эталонной базы данных.\n * По умолчанию не заполнен;\n * Указывается путь к файлу *.dt или *.1CD.\n " + }, "extensions" : { "type" : "array", "description" : "Массив расширений для загрузки в конфигурацию.", diff --git a/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy index f1b7e1aa..46ba640e 100644 --- a/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy +++ b/src/ru/pulsar/jenkins/library/configuration/InitInfoBaseOptions.groovy @@ -25,6 +25,19 @@ class InitInfoBaseOptions implements Serializable { """) String[] additionalInitializationSteps + @JsonPropertyDescription("""Путь к конфигурационному файлу vanessa-runner. + По умолчанию содержит значение "./tools/vrunner.json" + Используется, если на этапе подготовки база загружается из эталона. + """) + String vrunnerSettings + + @JsonPropertyDescription(""" + Путь к файлу эталонной базы данных. + * По умолчанию не заполнен; + * Указывается путь к файлу *.dt или *.1CD. + """) + String templateDBPath + @JsonPropertyDescription("Массив расширений для загрузки в конфигурацию.") Extension[] extensions @@ -62,6 +75,8 @@ class InitInfoBaseOptions implements Serializable { return "InitInfoBaseOptions{" + "initMethod=" + initMethod + ", runMigration=" + runMigration + + ", vrunnerSettings=" + vrunnerSettings + + ", templateDBPath=" + templateDBPath + ", additionalInitializationSteps=" + additionalInitializationSteps + ", extensions=" + extensions + '}' diff --git a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy index 080bc23a..8330abe6 100644 --- a/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy +++ b/src/ru/pulsar/jenkins/library/configuration/JobConfiguration.groovy @@ -115,6 +115,10 @@ class JobConfiguration implements Serializable { } } + boolean templateDBLoaded() { + return initInfoBaseOptions.templateDBPath != null && !initInfoBaseOptions.templateDBPath.isEmpty() + } + String v8AgentLabel() { return v8version } diff --git a/src/ru/pulsar/jenkins/library/configuration/TimeoutOptions.groovy b/src/ru/pulsar/jenkins/library/configuration/TimeoutOptions.groovy index 900f6a90..37babfc9 100644 --- a/src/ru/pulsar/jenkins/library/configuration/TimeoutOptions.groovy +++ b/src/ru/pulsar/jenkins/library/configuration/TimeoutOptions.groovy @@ -21,6 +21,11 @@ class TimeoutOptions implements Serializable { ''') Integer createInfoBase + @JsonPropertyDescription('''Таймаут шага загрузки конфигурации в базу, в минутах. + По умолчанию содержит значение 60. + ''') + Integer loadConfiguration + @JsonPropertyDescription('''Таймаут шага инициализации информационной базы, в минутах. По умолчанию содержит значение 60. ''') diff --git a/src/ru/pulsar/jenkins/library/steps/CreateInfobase.groovy b/src/ru/pulsar/jenkins/library/steps/CreateInfobase.groovy new file mode 100644 index 00000000..c7ee28f2 --- /dev/null +++ b/src/ru/pulsar/jenkins/library/steps/CreateInfobase.groovy @@ -0,0 +1,58 @@ +package ru.pulsar.jenkins.library.steps + +import ru.pulsar.jenkins.library.IStepExecutor +import ru.pulsar.jenkins.library.configuration.JobConfiguration +import ru.pulsar.jenkins.library.ioc.ContextRegistry +import ru.pulsar.jenkins.library.utils.Logger +import ru.pulsar.jenkins.library.utils.VRunner +import ru.pulsar.jenkins.library.utils.FileUtils + +class CreateInfobase implements Serializable { + + private final JobConfiguration config; + + CreateInfobase(JobConfiguration config) { + this.config = config + } + + def run() { + IStepExecutor steps = ContextRegistry.getContext().getStepExecutor() + + Logger.printLocation() + + def env = steps.env() + + steps.installLocalDependencies(); + + String templateDBPath = config.initInfoBaseOptions.templateDBPath + if (templateDBPath == '') { + // Не указан путь к базе данных, создадим пустую базу данных. + createBase() + } else if (templateDBPath.endsWith('.1CD')) { + // Это файл базы данных 1С, просто скопируем его. + String pathToInfobase = "$env.WORKSPACE/build/ib/1Cv8.1CD" + FileUtils.loadFile(templateDBPath, env, pathToInfobase) + } else if (templateDBPath.endsWith('.dt')) { + // Это файл дампа БД, скопируем его и создадим БД. + String pathToDt = "$env.WORKSPACE/build/tmp/dump.dt" + FileUtils.loadFile(templateDBPath, env, pathToDt) + createBase('build/tmp/dump.dt') + } else { + Logger.println("Неизвестный формат базы данных. Поддерживаются только .1CD и .dt") + } + + } + + private void createBase(String dtPath = '') { + Logger.println("Создание информационной базы") + String vrunnerPath = VRunner.getVRunnerPath(); + def initCommand = "$vrunnerPath init-dev --ibconnection \"/F./build/ib\"" + VRunner.exec(initCommand) + + if (dtPath) { + // Загрузка из dt в vrunner 2.2.2 не работает корректно, потому инициировать через init-dev не получится. + def loadDtCommand = "$vrunnerPath restore --ibconnection \"/F./build/ib\" $dtPath" + VRunner.exec(loadDtCommand) + } + } +} diff --git a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy index 68bd9502..4fac658e 100644 --- a/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy +++ b/src/ru/pulsar/jenkins/library/steps/GetExtensions.groovy @@ -54,7 +54,8 @@ class GetExtensions implements Serializable { buildExtension(it, srcDir, vrunnerPath, steps) } else if (it.initMethod == InitExtensionMethod.FILE){ Logger.println("Загрузка расширения ${it.name} из ${it.path}") - loadExtension(it, env) + String pathToExtension = "$pathToExtensionDir/${it.name}.cfe" + FileUtils.loadFile(it.path, env, pathToExtension) } else { Logger.println("Неизвестный метод инициализации расширения ${it.name}") } @@ -73,22 +74,6 @@ class GetExtensions implements Serializable { } } - private void loadExtension(Extension extension, def env) { - String pathToExtension = "$env.WORKSPACE/${EXTENSIONS_OUT_DIR}/${extension.name}.cfe" - FilePath localPathToExtension = FileUtils.getFilePath(pathToExtension) - - if (isValidUrl(extension.path)) { - // If the path is a URL, download the file - localPathToExtension.copyFrom(new URL(extension.path)) - } else { - // If the path is a local file, copy the file - String localPath = getAbsolutePath(extension.path, env) - FilePath localFilePath = FileUtils.getFilePath(localPath) - localPathToExtension.copyFrom(localFilePath) - } - } - - private String initVRunnerPath() { return VRunner.getVRunnerPath() } @@ -108,21 +93,4 @@ class GetExtensions implements Serializable { steps.unzip(sourceDirName, EdtToDesignerFormatTransformation.EXTENSION_ZIP) } } - - private static boolean isValidUrl(String url) { - try { - new URL(url) - return true - } catch (MalformedURLException e) { - return false - } - } - - private static String getAbsolutePath(String path, def env) { - if (path.startsWith("/") || path.startsWith("\\") || path.matches("^[A-Za-z]:.*")) { - return path - } else { - return "${env.WORKSPACE}/${path}" - } - } } diff --git a/src/ru/pulsar/jenkins/library/steps/InitFromFiles.groovy b/src/ru/pulsar/jenkins/library/steps/InitFromFiles.groovy index e08fa32a..47445ce3 100644 --- a/src/ru/pulsar/jenkins/library/steps/InitFromFiles.groovy +++ b/src/ru/pulsar/jenkins/library/steps/InitFromFiles.groovy @@ -9,7 +9,7 @@ import ru.pulsar.jenkins.library.utils.VRunner class InitFromFiles implements Serializable { - private final JobConfiguration config; + private final JobConfiguration config InitFromFiles(JobConfiguration config) { this.config = config @@ -25,25 +25,32 @@ class InitFromFiles implements Serializable { return } - steps.installLocalDependencies(); Logger.println("Распаковка файлов") - String srcDir; + String srcDir if (config.sourceFormat == SourceFormat.EDT) { - def env = steps.env(); + def env = steps.env() srcDir = "$env.WORKSPACE/$EdtToDesignerFormatTransformation.CONFIGURATION_DIR" steps.unstash(EdtToDesignerFormatTransformation.CONFIGURATION_ZIP_STASH) steps.unzip(srcDir, EdtToDesignerFormatTransformation.CONFIGURATION_ZIP) } else { - srcDir = config.srcDir; + srcDir = config.srcDir } Logger.println("Выполнение загрузки конфигурации из файлов") - String vrunnerPath = VRunner.getVRunnerPath(); - def initCommand = "$vrunnerPath init-dev --src $srcDir --ibconnection \"/F./build/ib\"" - VRunner.exec(initCommand) + String vrunnerPath = VRunner.getVRunnerPath() + def command = "$vrunnerPath update-dev --src $srcDir --ibconnection \"/F./build/ib\"" + + def options = config.initInfoBaseOptions + + String vrunnerSettings = options.vrunnerSettings + if (config.templateDBLoaded() && steps.fileExists(vrunnerSettings)) { + command += " --settings $vrunnerSettings" + } + + VRunner.exec(command) } } diff --git a/src/ru/pulsar/jenkins/library/steps/InitFromStorage.groovy b/src/ru/pulsar/jenkins/library/steps/InitFromStorage.groovy index 888dde1f..79b805db 100644 --- a/src/ru/pulsar/jenkins/library/steps/InitFromStorage.groovy +++ b/src/ru/pulsar/jenkins/library/steps/InitFromStorage.groovy @@ -31,7 +31,6 @@ class InitFromStorage implements Serializable { return } - steps.installLocalDependencies() String storageVersion = VersionParser.storage() String storageVersionParameter = storageVersion == "" ? "" : "--storage-ver $storageVersion" @@ -54,8 +53,18 @@ class InitFromStorage implements Serializable { 'RUNNER_STORAGE_NAME' ) ]) { + Logger.println("Выполнение загрузки конфигурации из хранилища") String vrunnerPath = VRunner.getVRunnerPath() - VRunner.exec "$vrunnerPath init-dev --storage $storageVersionParameter --ibconnection \"/F./build/ib\"" + def command = "$vrunnerPath update-dev --storage $storageVersionParameter --ibconnection \"/F./build/ib\"" + + def options = config.initInfoBaseOptions + + String vrunnerSettings = options.vrunnerSettings + if (config.templateDBLoaded() && steps.fileExists(vrunnerSettings)) { + command += " --settings $vrunnerSettings" + } + + VRunner.exec(command) } } diff --git a/src/ru/pulsar/jenkins/library/steps/InitInfoBase.groovy b/src/ru/pulsar/jenkins/library/steps/InitInfoBase.groovy index 981e52e4..d3cedc6b 100644 --- a/src/ru/pulsar/jenkins/library/steps/InitInfoBase.groovy +++ b/src/ru/pulsar/jenkins/library/steps/InitInfoBase.groovy @@ -9,7 +9,7 @@ import ru.pulsar.jenkins.library.utils.VRunner class InitInfoBase implements Serializable { - private final JobConfiguration config; + private final JobConfiguration config InitInfoBase(JobConfiguration config) { this.config = config @@ -30,9 +30,17 @@ class InitInfoBase implements Serializable { List logosConfig = ["LOGOS_CONFIG=$config.logosConfig"] steps.withEnv(logosConfig) { - String vrunnerPath = VRunner.getVRunnerPath(); + String vrunnerPath = VRunner.getVRunnerPath() - if (config.initInfoBaseOptions.runMigration) { + // Нужны ли настройки vrunner + def options = config.initInfoBaseOptions + String settingsIncrement = '' + String vrunnerSettings = options.vrunnerSettings + if (config.templateDBLoaded() && steps.fileExists(vrunnerSettings)) { + settingsIncrement = " --settings $vrunnerSettings" + } + + if (options.runMigration) { Logger.println("Запуск миграции ИБ") String command = vrunnerPath + ' run --command "ЗапуститьОбновлениеИнформационнойБазы;ЗавершитьРаботуСистемы;" --execute ' @@ -40,9 +48,10 @@ class InitInfoBase implements Serializable { if (steps.isUnix()) { executeParameter = '\\' + executeParameter } - command += executeParameter; + command += executeParameter command += ' --ibconnection "/F./build/ib"' + command += settingsIncrement // Запуск миграции steps.catchError { VRunner.exec(command) @@ -52,7 +61,7 @@ class InitInfoBase implements Serializable { } steps.catchError { - if (config.initInfoBaseOptions.additionalInitializationSteps.length == 0) { + if (options.additionalInitializationSteps.length == 0) { FileWrapper[] files = steps.findFiles("tools/vrunner.init*.json") files = files.sort new OrderBy( { it.name }) files.each { @@ -60,9 +69,9 @@ class InitInfoBase implements Serializable { VRunner.exec("$vrunnerPath vanessa --settings ${it.path} --ibconnection \"/F./build/ib\"") } } else { - config.initInfoBaseOptions.additionalInitializationSteps.each { + options.additionalInitializationSteps.each { Logger.println("Первичная инициализация командой ${it}") - VRunner.exec("$vrunnerPath ${it} --ibconnection \"/F./build/ib\"") + VRunner.exec("$vrunnerPath ${it} --ibconnection \"/F./build/ib\"${settingsIncrement}") } } } diff --git a/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy b/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy index ced8c88b..1f7bef3d 100644 --- a/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy +++ b/src/ru/pulsar/jenkins/library/steps/LoadExtensions.groovy @@ -2,6 +2,7 @@ package ru.pulsar.jenkins.library.steps import ru.pulsar.jenkins.library.IStepExecutor import ru.pulsar.jenkins.library.configuration.JobConfiguration +import ru.pulsar.jenkins.library.configuration.InitInfoBaseOptions import ru.pulsar.jenkins.library.configuration.InitInfoBaseOptions.Extension import ru.pulsar.jenkins.library.ioc.ContextRegistry import ru.pulsar.jenkins.library.utils.Logger @@ -83,14 +84,18 @@ class LoadExtensions implements Serializable { return "" } - String optionsName = "${stageName.toLowerCase()}Options" + String optionsPropertyName = "${stageName}Options" + def optionsInstance = config."$optionsPropertyName" - def optionsInstance = config."$optionsName" + if (!optionsInstance) { + return "" + } - if (optionsInstance) { - return optionsInstance."vrunnerSettings" - } else { + // For InitInfoBaseOptions, return the vrunner settings path only if the database is loaded from an archive + if (optionsInstance instanceof InitInfoBaseOptions && !config.templateDBLoaded()) { return "" } + + return optionsInstance.vrunnerSettings } } diff --git a/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy b/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy index e7a0f6c2..721f6800 100644 --- a/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy +++ b/src/ru/pulsar/jenkins/library/utils/FileUtils.groovy @@ -41,4 +41,36 @@ class FileUtils { .replaceAll('\\\\', '/') .toString() } + + static void loadFile(String filePathFrom, def env, String filePathTo) { + + FilePath localPathToFile = getFilePath(filePathTo) + + if (isValidUrl(filePathFrom)) { + // If the path is a URL, download the file + localPathToFile.copyFrom(new URL(filePathFrom)) + } else { + // If the path is a local file, copy the file + String localPath = getAbsolutePath(filePathFrom, env) + FilePath localFilePath = getFilePath(localPath) + localPathToFile.copyFrom(localFilePath) + } + } + + private static boolean isValidUrl(String url) { + try { + new URL(url).toURI() + return true + } catch (MalformedURLException | URISyntaxException e) { + return false + } + } + + private static String getAbsolutePath(String path, def env) { + if (path.startsWith("/") || path.startsWith("\\") || path.matches("^[A-Za-z]:.*")) { + return path + } else { + return "${env.WORKSPACE}/${path}" + } + } } diff --git a/test/integration/groovy/printLocationTest.groovy b/test/integration/groovy/printLocationTest.groovy index e5a3a09f..57cbdf32 100644 --- a/test/integration/groovy/printLocationTest.groovy +++ b/test/integration/groovy/printLocationTest.groovy @@ -35,7 +35,7 @@ class printLocationTest { final WorkflowJob workflowJob = rule.createProject(WorkflowJob, 'project') workflowJob.definition = flow - rule.assertLogContains('Running on node master', rule.buildAndAssertSuccess(workflowJob)) + rule.assertLogContains('Running on node built-in', rule.buildAndAssertSuccess(workflowJob)) } } diff --git a/vars/createInfobase.groovy b/vars/createInfobase.groovy new file mode 100644 index 00000000..e908d851 --- /dev/null +++ b/vars/createInfobase.groovy @@ -0,0 +1,10 @@ +import ru.pulsar.jenkins.library.configuration.JobConfiguration +import ru.pulsar.jenkins.library.ioc.ContextRegistry +import ru.pulsar.jenkins.library.steps.CreateInfobase + +def call(JobConfiguration config) { + ContextRegistry.registerDefaultContext(this) + + def createInfobase = new CreateInfobase(config) + createInfobase.run() +} \ No newline at end of file diff --git a/vars/pipeline1C.groovy b/vars/pipeline1C.groovy index 731e9eeb..867e3830 100644 --- a/vars/pipeline1C.groovy +++ b/vars/pipeline1C.groovy @@ -92,7 +92,14 @@ void call() { steps { timeout(time: config.timeoutOptions.createInfoBase, unit: TimeUnit.MINUTES) { createDir('build/out/') + createInfobase config + } + } + } + stage('Загрузка конфигурации') { + steps { + timeout(time: config.timeoutOptions.loadConfiguration, unit: TimeUnit.MINUTES) { script { if (config.infoBaseFromFiles()) { // Создание базы загрузкой из файлов @@ -113,7 +120,7 @@ void call() { } steps { timeout(time: config.timeoutOptions.loadExtensions, unit: TimeUnit.MINUTES) { - loadExtensions config + loadExtensions config, 'initInfoBase' } } }