From 0e784e488c200c803b38c93a8c2099431f808bc5 Mon Sep 17 00:00:00 2001 From: Artur Ayukhanov Date: Wed, 27 Nov 2024 13:52:57 +0300 Subject: [PATCH] =?UTF-8?q?=D0=BF=D0=BE=D0=BB=D0=BD=D1=8B=D0=B9=20=D0=BE?= =?UTF-8?q?=D1=82=D0=BA=D0=B0=D0=B7=20=D0=BE=D1=82=20opm=20run=20init?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .github/CONTRIBUTING.md | 4 ++-- .travis.yml | 8 ++++---- F.A.Q.MD | 2 +- Jenkinsfile | 12 ++++++------ tools/jenkins/Jenkinsfile-fast | 4 ++-- 5 files changed, 15 insertions(+), 15 deletions(-) diff --git a/.github/CONTRIBUTING.md b/.github/CONTRIBUTING.md index 8449b9b1e..84e42f553 100644 --- a/.github/CONTRIBUTING.md +++ b/.github/CONTRIBUTING.md @@ -2,7 +2,7 @@ ## Простой чек-лист использования -- если скачали в первый раз, выполните `opm run init` +- если скачали в первый раз, выполните `oscript tasks/init.os` - для сборки\компиляции только внешних файлов выполните `opm run cepf` - все соберется, только тестовые ИБ не будут обновлены - для выгрузки\декомпиляции своих изменений в исходники `opm run depf` - и стандартный процесс Гитхаба - Пулл-реквесты и т.д. @@ -99,7 +99,7 @@ git pull upstream develop * Выполняем ``` cd add - opm run init + oscript tasks/init.os ``` > ВНИМАНИЕ: команды `opm` необходимо выполнять в обычном виндовом `cmd\far` , но не в bash-консоли, т.к. не сможет найти команду `opm` diff --git a/.travis.yml b/.travis.yml index 9667d4e17..3865a0c6a 100644 --- a/.travis.yml +++ b/.travis.yml @@ -51,7 +51,7 @@ jobs: - sudo docker ps && sleep 5 - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 wget -q --continue -O /tmp/oscript.deb https://oscript.io/downloads/latest/x64/onescript-engine_1.3.0_all.deb && sudo dpkg -i /tmp/oscript.deb" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm install opm && sudo opm install" - - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run init file --buildFolderPath ./build" + - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo oscript tasks/init.os file --buildFolderPath ./build" - sudo docker stop "$(cat /tmp/container_id)" - stage: test @@ -63,7 +63,7 @@ jobs: - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 wget -q --continue -O /tmp/oscript.deb https://oscript.io/downloads/latest/x64/onescript-engine_1.3.0_all.deb && sudo dpkg -i /tmp/oscript.deb" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm install opm && sudo opm install && sudo opm update vanessa-runner && sudo opm install v8find" - ./tools/linux/travistest.sh ./features/StepsRunner/ - - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run initib file --buildFolderPath ./build" + - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo oscript tasks/initib.os file --buildFolderPath ./build" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run vanessatravis all --path ./features/StepsRunner/ --settings ./tools/JSON/VBParams8310linux.json" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run vanessatravis all --path ./features/StepsProgramming/ --settings ./tools/JSON/VBParams8310linux.json" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run vanessatravis all --path ./features/Core/FeatureLoad/ --settings ./tools/JSON/VBParams8310linux.json" @@ -79,7 +79,7 @@ jobs: - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 wget -q --continue -O /tmp/oscript.deb https://oscript.io/downloads/latest/x64/onescript-engine_1.3.0_all.deb && sudo dpkg -i /tmp/oscript.deb" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm install opm && sudo opm install && sudo opm update vanessa-runner && sudo opm install v8find" - ./tools/linux/travistest.sh ./features/Core/Translate/ - - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run initib file --buildFolderPath ./build" + - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo oscript tasks/initib.os file --buildFolderPath ./build" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run vanessatravis all --path ./features/Core/Translate/ --settings ./tools/JSON/VBParams8310linux.json" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run vanessatravis all --path ./features/Core/FeatureReader/ --settings ./tools/JSON/VBParams8310linux.json" # - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run vanessatravis all --path ./features/Core/FeatureReader/ --settings ./tools/JSON/VBParams8310linux.json" @@ -95,7 +95,7 @@ jobs: - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 wget -q --continue -O /tmp/oscript.deb https://oscript.io/downloads/latest/x64/onescript-engine_1.3.0_all.deb && sudo dpkg -i /tmp/oscript.deb" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm install opm && sudo opm install && sudo opm update vanessa-runner && sudo opm install v8find" - ./tools/linux/travistest.sh ./features/Core/FeatureReader/ - - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run initib file --buildFolderPath ./build" + - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo oscript tasks/initib.os file --buildFolderPath ./build" - sudo docker exec -u ubuntu "$(cat /tmp/container_id)" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm run vanessatravis all --path ./features/Core/TestClient/ --settings ./tools/JSON/VBParams8310linux.json" - sudo docker stop "$(cat /tmp/container_id)" - sudo docker stop "$(cat /tmp/container_idngrok )" diff --git a/F.A.Q.MD b/F.A.Q.MD index 3f7d38d8e..842b24d81 100644 --- a/F.A.Q.MD +++ b/F.A.Q.MD @@ -675,7 +675,7 @@ vrunner vanessa --settings tools\vrunner.json --path ПутьККаталогу Самый простой способ - - выполнить команду `opm run init` согласно [Руководству контрибьютора](./.github\CONTRIBUTING.md) + - выполнить команду `oscript tasks/init.os` согласно [Руководству контрибьютора](./.github\CONTRIBUTING.md) - и немного подождать ### 2. Как быстро написать проверочную фичу для новой возможности, реализуемой внутри самого Vanessa.ADD или его плагина? diff --git a/Jenkinsfile b/Jenkinsfile index 6ed166bc5..804b58fd8 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -43,7 +43,7 @@ def behaviortask(build, path, suffix, version){ // env.LOGOS_LEVEL = 'DEBUG' // sh 'printenv' - cmd "opm run initib file --buildFolderPath ./build --v8version ${version}" + cmd "oscript tasks/initib.os file --buildFolderPath ./build --v8version ${version}" withEnv(["VANESSA_JUNITPATH=./ServiceBases/junitreport/${suffix}", "VANESSA_cucumberreportpath=./ServiceBases/cucumber/${suffix}"]) { //Маленький хак, переход в dir автоматом создает каталог и не надо писать кроссплатформенный mkdir -p @@ -91,7 +91,7 @@ tasks["behavior video write"] = { // cmd "opm install" // cmd "opm list" - // cmd "opm run initib file --buildFolderPath ./build --v8version 8.3.10" + // cmd "oscript tasks/initib.os file --buildFolderPath ./build --v8version 8.3.10" // cmd "opm run vanessa all --path ./features/Core/TestClient/ --tag video --settings ./tools/JSON/VBParams8310UF.json"; // } catch (e) { @@ -147,7 +147,7 @@ tasks["xdd"] = { // env.LOGOS_LEVEL = 'DEBUG' // // sh 'printenv' - // cmd "opm run initib file --buildFolderPath ./build --v8version 8.3.10" + // cmd "oscript tasks/initib.os file --buildFolderPath ./build --v8version 8.3.10" // cmd "opm run xdd"; // } catch (e) { @@ -251,9 +251,9 @@ firsttasks["slave"] = { // env.LOGOS_LEVEL = 'DEBUG' // sh 'printenv' - cmd "opm run init file --buildFolderPath ./build" + cmd "oscript tasks/init.os file --buildFolderPath ./build" // } catch (e) { - // echo "opm run init ${it} status : ${e}" + // echo "oscript tasks/init.os ${it} status : ${e}" // currentBuild.result = 'UNSTABLE' // } stash excludes: 'build/cache.txt,build/ib/**,build/ibservice/**, build/ibservicexdd/**', includes: 'build/**', name: 'buildResults' @@ -284,7 +284,7 @@ firsttasks["slave"] = { // cmd(command); // sh 'sleep 10' // sh 'sudo docker exec -u ubuntu "$(cat /tmp/container_id_${BUILD_NUMBER})" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 sudo opm install && sudo opm update -all"' -// sh 'sudo docker exec -u ubuntu "$(cat /tmp/container_id_${BUILD_NUMBER})" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 opm run init && opm run clean"' +// sh 'sudo docker exec -u ubuntu "$(cat /tmp/container_id_${BUILD_NUMBER})" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 oscript tasks/init.os && opm run clean"' // sh 'sudo rm -f add*.ospx' // sh 'sudo docker exec -u ubuntu "$(cat /tmp/container_id_${BUILD_NUMBER})" /bin/bash -c "cd /home/ubuntu/code; DISPLAY=:1.0 opm build ./"' // sh 'sudo rm -rf add.tar.gz && sudo rm -f add-devel.tar.gz && sudo rm -f add.zip' diff --git a/tools/jenkins/Jenkinsfile-fast b/tools/jenkins/Jenkinsfile-fast index 84b27f299..f785a9079 100644 --- a/tools/jenkins/Jenkinsfile-fast +++ b/tools/jenkins/Jenkinsfile-fast @@ -66,7 +66,7 @@ node("vanessa-add") { echo "Сборка бинарных файлов" timeout(90){ timestamps { - cmd("opm run init file --v8version 8.3.10", isUnix) + cmd("oscript tasks/init.os file --v8version 8.3.10", isUnix) } } @@ -394,4 +394,4 @@ def makeAllure(allureResults) { echo "allure status : ${e}" currentBuild.result = 'UNSTABLE' } -} \ No newline at end of file +}