Main build (Jenkins)

2025-08-10 22:41:43 +02:00 · 2024-12-11 14:14:24 +03:00
parent cca4145cce
commit 37d7c0c4e4
12 changed files with 5895 additions and 5815 deletions
--- a/.github/workflows/oint_test_full_en.yml
+++ b/.github/workflows/oint_test_full_en.yml
@@ -1305,9 +1305,51 @@ jobs:
          key: logs-S3
          path: ./docs/en/results/S3

+
+  Testing-MongoDB:
+    runs-on: ubuntu-latest
+    needs: [Decode, Build]
+    steps:
+
+      - uses: actions/checkout@v2 
+      - uses: otymko/setup-onescript@v1.4
+        with:
+          version: 1.9.1
+      
+      - name: Получить тестовые данные из кэша
+        uses: actions/cache/restore@v3
+        with:
+          key: test-data
+          path: ./data.json
+      
+      - name: Установить asserts и 1testrunner
+        run: |
+          opm install asserts
+          opm install 1testrunner
+
+      - name: Установить OInt
+        run: |
+          TEMP_DEB="$(mktemp)" &&
+          wget -O "$TEMP_DEB" 'https://api.athenaeum.digital/tc/job/Release/lastSuccessfulBuild/artifact/1.16.1/oint_1.16.1_all_en.deb' &&
+          sudo dpkg -i "$TEMP_DEB"
+          rm -f "$TEMP_DEB"
+
+
+
+      - name: Database management
+        if: ${{ cancelled() }} == false
+        run: oscript /home/runner/.local/share/ovm/current/lib/1testrunner/src/main.os -run ./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os "CLI_Mongo_DatabaseManagement"
+
+      - name: Записать логи
+        if: ${{ cancelled() }} == false
+        uses: actions/cache/save@v3
+        with:
+          key: logs-MongoDB
+          path: ./docs/en/results/MongoDB
+
  Encode:
    runs-on: ubuntu-latest
-    needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMetrika,Testing-S3]
+    needs: [Testing-Telegram,Testing-VK,Testing-Viber,Testing-Twitter,Testing-YandexDisk,Testing-GoogleWorkspace,Testing-GoogleCalendar,Testing-GoogleDrive,Testing-GoogleSheets,Testing-Notion,Testing-Slack,Testing-Airtable,Testing-Dropbox,Testing-Bitrix24,Testing-VkTeams,Testing-Ozon,Testing-Neocities,Testing-CDEK,Testing-YandexMetrika,Testing-S3,Testing-MongoDB]
    if: ${{ always() }}
    permissions:
      contents: write
@@ -1655,6 +1697,22 @@ jobs:
          -H "X-GitHub-Api-Version: 2022-11-28" \
          "https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-S3"

+      - name: Получить логи MongoDB
+        uses: actions/cache/restore@v3
+        with:
+          key: logs-MongoDB
+          path: ./docs/en/results/MongoDB
+
+
+      - name: Очистка логов MongoDB
+        run: |
+          curl -L \
+          -X DELETE \
+          -H "Accept: application/vnd.github+json" \
+          -H "Authorization: Bearer ${{ secrets.TOKEN }}" \
+          -H "X-GitHub-Api-Version: 2022-11-28" \
+          "https://api.github.com/repos/Bayselonarrend/OpenIntegrations/actions/caches?key=logs-MongoDB"
+

      - name: Записать данные    
        uses: stefanzweifel/git-auto-commit-action@v5   
@@ -1667,7 +1725,7 @@ jobs:

  Clear-Cache:
    runs-on: ubuntu-latest
-    needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMetrika, Testing-S3, Encode]
+    needs: [Testing-Telegram, Testing-VK, Testing-Viber, Testing-Twitter, Testing-YandexDisk, Testing-GoogleWorkspace, Testing-GoogleCalendar, Testing-GoogleDrive, Testing-GoogleSheets, Testing-Notion, Testing-Slack, Testing-Airtable, Testing-Dropbox, Testing-Bitrix24, Testing-VkTeams, Testing-Ozon, Testing-Neocities, Testing-CDEK, Testing-YandexMetrika, Testing-S3, Testing-MongoDB, Encode]
    if: ${{ always() }}
    steps:
      - name: Очистка основного кэша
--- a/ci/cli_ostesten
+++ b/ci/cli_ostesten
@@ -656,6 +656,17 @@ pipeline {
 			}
 		}

+        stage('Testing-MongoDB') {
+			steps {
+					
+
+               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
+					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_TestsCLI.os" "CLI_Mongo_DatabaseManagement"'
+               }
+
+			}
+		}
+
   }
      post{
         always{
--- a/ci/ostesten
+++ b/ci/ostesten
@@ -656,6 +656,17 @@ pipeline {
 			}
 		}

+        stage('Testing-MongoDB') {
+			steps {
+					
+
+               catchError(buildResult: 'FAILURE', stageResult: 'FAILURE') {   
+					powershell encoding: 'UTF-8', script:'1testrunner -run "./src/en/OInt/tests/Modules/internal/OPI_Tests.os" "Mongo_DatabaseManagement"'
+               }
+
+			}
+		}
+
   }
      post{
         always{
--- a/service/dictionaries/en.json
+++ b/service/dictionaries/en.json
--- a/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os
+++ b/src/en/OInt/tools/Modules/OPI_TestDataRetrieval.os
@@ -69,7 +69,7 @@ Function GetTestingSectionMapping() Export
    Sections.Insert("CDEK"           , 5);
    Sections.Insert("YandexMetrika"  , 5);
    Sections.Insert("S3"             , 5);
-    Sections.Insert("MongoDB" , 5);
+    Sections.Insert("MongoDB"        , 5);

    Return Sections;

@@ -101,7 +101,7 @@ Function GetTestingSectionMappingGA() Export
    Sections.Insert("CDEK"           , StandardDependencies);
    Sections.Insert("YandexMetrika"  , StandardDependencies);
    Sections.Insert("S3"             , StandardDependencies);
-    Sections.Insert("MongoDB" , StandardDependencies);
+    Sections.Insert("MongoDB"        , StandardDependencies);

    Return Sections;

@@ -129,7 +129,7 @@ Function GetTestTable() Export
    Cdek      = "CDEK";
    Metrika   = "YandexMetrika";
    S3_       = "S3";
-    Mongo        = "MongoDB";
+    Mongo     = "MongoDB";

    TestTable = New ValueTable;
    TestTable.Columns.Add("Method");
@@ -261,7 +261,7 @@ Function GetTestTable() Export
    NewTest(TestTable, "AWS_CommonMethods"                    , "Common methods"                  , S3_);
    NewTest(TestTable, "AWS_BucketsManagement"                , "Buckets management"              , S3_);
    NewTest(TestTable, "AWS_ObjectsManagement"                , "Objects management"              , S3_);
-    NewTest(TestTable, "Mongo_DatabaseManagement" , "Database management" , Mongo);
+    NewTest(TestTable, "Mongo_DatabaseManagement"             , "Database management"             , Mongo);

    Return TestTable;

--- a/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
+++ b/src/en/OInt/tools/Modules/internal/Modules/OPI_Tools.os
@@ -1030,7 +1030,7 @@ EndFunction

 Function GetAddIn(Val AddInName, Val Class = "Main") Export

-    AddIn  = Undefined;
+    AddIn     = Undefined;
    AddInName = "OPI_" + AddInName;

    If Not InitializeAddIn(AddInName, Class, AddIn) Then
@@ -1562,7 +1562,7 @@ Function AttachAddInOnServer(Val AddInName)
    If IsOneScript() Then
        TemplateName = AddInsFolderOS() + AddInName + Extension;
    Else
-        TemplateName       = "CommonTemplate." + TemplateName;
+        TemplateName = "CommonTemplate." + TemplateName;
    EndIf;

    Return AttachAddIn(TemplateName, AddInName, AddInType.Native);
--- a/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_TestDataRetrieval/Module.bsl
@@ -69,7 +69,7 @@ Function GetTestingSectionMapping() Export
    Sections.Insert("CDEK"           , 5);
    Sections.Insert("YandexMetrika"  , 5);
    Sections.Insert("S3"             , 5);
-    Sections.Insert("MongoDB" , 5);
+    Sections.Insert("MongoDB"        , 5);

    Return Sections;

@@ -101,7 +101,7 @@ Function GetTestingSectionMappingGA() Export
    Sections.Insert("CDEK"           , StandardDependencies);
    Sections.Insert("YandexMetrika"  , StandardDependencies);
    Sections.Insert("S3"             , StandardDependencies);
-    Sections.Insert("MongoDB" , StandardDependencies);
+    Sections.Insert("MongoDB"        , StandardDependencies);

    Return Sections;

@@ -129,7 +129,7 @@ Function GetTestTable() Export
    Cdek      = "CDEK";
    Metrika   = "YandexMetrika";
    S3_       = "S3";
-    Mongo        = "MongoDB";
+    Mongo     = "MongoDB";

    TestTable = New ValueTable;
    TestTable.Columns.Add("Method");
@@ -261,7 +261,7 @@ Function GetTestTable() Export
    NewTest(TestTable, "AWS_CommonMethods"                    , "Common methods"                  , S3_);
    NewTest(TestTable, "AWS_BucketsManagement"                , "Buckets management"              , S3_);
    NewTest(TestTable, "AWS_ObjectsManagement"                , "Objects management"              , S3_);
-    NewTest(TestTable, "Mongo_DatabaseManagement" , "Database management" , Mongo);
+    NewTest(TestTable, "Mongo_DatabaseManagement"             , "Database management"             , Mongo);

    Return TestTable;

--- a/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
+++ b/src/en/OPI/src/CommonModules/OPI_Tools/Module.bsl
@@ -1030,7 +1030,7 @@ EndFunction

 Function GetAddIn(Val AddInName, Val Class = "Main") Export

-    AddIn  = Undefined;
+    AddIn     = Undefined;
    AddInName = "OPI_" + AddInName;

    If Not InitializeAddIn(AddInName, Class, AddIn) Then
@@ -1562,7 +1562,7 @@ Function AttachAddInOnServer(Val AddInName)
    If IsOneScript() Then
        TemplateName = AddInsFolderOS() + AddInName + Extension;
    Else
-        TemplateName       = "CommonTemplate." + TemplateName;
+        TemplateName = "CommonTemplate." + TemplateName;
    EndIf;

    Return AttachAddIn(TemplateName, AddInName, AddInType.Native);
--- a/src/ru/OInt/tools/Modules/OPI_ПолучениеДанныхТестов.os
+++ b/src/ru/OInt/tools/Modules/OPI_ПолучениеДанныхТестов.os
@@ -129,7 +129,7 @@
    Сдэк      = "CDEK";
    Метрика   = "YandexMetrika";
    S3_       = "S3";
-    Монго        = "MongoDB";
+    Монго     = "MongoDB";

    ТаблицаТестов = Новый ТаблицаЗначений;
    ТаблицаТестов.Колонки.Добавить("Метод");
--- a/src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os
+++ b/src/ru/OInt/tools/Modules/internal/Modules/OPI_Инструменты.os
@@ -1030,7 +1030,7 @@

 Функция ПолучитьКомпоненту(Знач ИмяКомпоненты, Знач Класс = "Main") Экспорт

-    Компонента = Неопределено;
+    Компонента    = Неопределено;
    ИмяКомпоненты = "OPI_" + ИмяКомпоненты;

    Если Не ИнициализироватьВнешнююКомпоненту(ИмяКомпоненты, Класс, Компонента) Тогда
@@ -1562,7 +1562,7 @@
    Если ЭтоOneScript() Тогда
        ИмяМакета = КаталогКомпонентOS() + ИмяКомпоненты + Расширение;
    Иначе
-        ИмяМакета       = "ОбщийМакет." + ИмяМакета;
+        ИмяМакета = "ОбщийМакет." + ИмяМакета;
    КонецЕсли;

    Возврат ПодключитьВнешнююКомпоненту(ИмяМакета, ИмяКомпоненты, ТипВнешнейКомпоненты.Native);
--- a/src/ru/OPI/src/CommonModules/OPI_Инструменты/Module.bsl
+++ b/src/ru/OPI/src/CommonModules/OPI_Инструменты/Module.bsl
@@ -1030,7 +1030,7 @@

 Функция ПолучитьКомпоненту(Знач ИмяКомпоненты, Знач Класс = "Main") Экспорт

-    Компонента = Неопределено;
+    Компонента    = Неопределено;
    ИмяКомпоненты = "OPI_" + ИмяКомпоненты;

    Если Не ИнициализироватьВнешнююКомпоненту(ИмяКомпоненты, Класс, Компонента) Тогда
@@ -1562,7 +1562,7 @@
    Если ЭтоOneScript() Тогда
        ИмяМакета = КаталогКомпонентOS() + ИмяКомпоненты + Расширение;
    Иначе
-        ИмяМакета       = "ОбщийМакет." + ИмяМакета;
+        ИмяМакета = "ОбщийМакет." + ИмяМакета;
    КонецЕсли;

    Возврат ПодключитьВнешнююКомпоненту(ИмяМакета, ИмяКомпоненты, ТипВнешнейКомпоненты.Native);
--- a/src/ru/OPI/src/CommonModules/OPI_ПолучениеДанныхТестов/Module.bsl
+++ b/src/ru/OPI/src/CommonModules/OPI_ПолучениеДанныхТестов/Module.bsl
@@ -129,7 +129,7 @@
    Сдэк      = "CDEK";
    Метрика   = "YandexMetrika";
    S3_       = "S3";
-    Монго        = "MongoDB";
+    Монго     = "MongoDB";

    ТаблицаТестов = Новый ТаблицаЗначений;
    ТаблицаТестов.Колонки.Добавить("Метод");