KOGITO-8110 Correct GHA DSL checks and seed test script (apache#646)

* Correct GHA DSL tests Co-authored-by: Enrique Mingorance Cano <ginxaco@gmail.com> * updated seed test script * cleanup Co-authored-by: Enrique Mingorance Cano <ginxaco@gmail.com>
cimbalek · Oct 14, 2022 · 3aef481 · 3aef481
1 parent e6ccefd
commit 3aef481
Show file tree

Hide file tree

Showing 8 changed files with 351 additions and 257 deletions.
diff --git a/.ci/actions/dsl-tests/action.yml b/.ci/actions/dsl-tests/action.yml
@@ -2,8 +2,15 @@ name: 'DSL tests'
 description: 'Tests DSL generation'
 inputs:
   repository:
-    description: author/repository to check
+    description: author/repository to test
     required: false
+  reference:
+    description: reference to test
+    required: false
+  jobs-folder-path:
+    description: folder path where to find the jobs.groovy file
+    required: false
+    default: .ci/jenkins/dsl
   main-config-file-repo:
     description: author/repository to find the main config file
     required: false
@@ -13,21 +20,13 @@ inputs:
   main-config-file-path:
     description: path to find the main config file
     required: false
-  branch-config-branch:
-    description: branch config branch to look for
-    required: false
-    deprecationMessage: Please use the `branch-config-name` input instead
   branch-config-name:
     description: branch config name to look for
     required: false
   base-branch:
     description: base branch for the checks
     required: false
     default: ''
-  jobs-folder-path:
-    description: folder path where to find the jobs.groovy file
-    required: false
-    default: .ci/jenkins/dsl
   save-results:
     description: whether results of testing should be saved. Default to true.
     required: false
@@ -42,7 +41,7 @@ runs:
       java-version: 11
 
   - name: Checkout Seed repo
-    uses: actions/checkout@v2
+    uses: actions/checkout@v3
     with:
       repository: kiegroup/kogito-pipelines
       ref: main
@@ -63,23 +62,31 @@ runs:
       echo "Using pipelines test dir ${pipelines_test_dir}"
       echo "PIPELINES_TEST_DIR=${pipelines_test_dir}" >> $GITHUB_ENV
 
+  - name: Checkout current repo
+    uses: actions/checkout@v3
+    with:
+      path: dsl-tests-dir
+
   - name: Test DSL
     shell: bash
-    working-directory: seed_repo
+    working-directory: dsl-tests-dir
     env:
-      DSL_DEFAULT_REPOSITORY: ${{ inputs.repository }}
+      DSL_DEFAULT_TEST_REPO: ${{ inputs.repository }}
+      DSL_DEFAULT_TEST_REF: ${{ inputs.reference }}
+
       DSL_DEFAULT_MAIN_CONFIG_FILE_REPO: ${{ inputs.main-config-file-repo }}
       DSL_DEFAULT_MAIN_CONFIG_FILE_REF: ${{ inputs.main-config-file-ref }}
       DSL_DEFAULT_MAIN_CONFIG_FILE_PATH: ${{ inputs.main-config-file-path }}
+
       DSL_DEFAULT_BRANCH_CONFIG_NAME: ${{ inputs.branch-config-name }}
-      DSL_DEFAULT_BRANCH_CONFIG_BRANCH: ${{ inputs.branch-config-branch }}
-      PIPELINES_TEST_DIR: ${{ env.PIPELINES_TEST_DIR }}
+
+      DSL_DEFAULT_FALLBACK_PIPELINES_REF: ${{ env.BASE_BRANCH }}
+      DSL_DEFAULT_PIPELINES_TEST_DIR: ${{ env.PIPELINES_TEST_DIR }}
+
+      DSL_DEFAULT_CURRENT_REPOSITORY: ${{ github.event.pull_request.head.repo.full_name }}
+      DSL_DEFAULT_CURRENT_REF: ${{ github.event.pull_request.head.ref }}
     run: |
-      dsl/seed/scripts/seed_test.sh -h ${{ github.head_ref }} \
-              -r ${{ github.event.pull_request.head.repo.full_name }} \
-              -b ${{ env.BASE_BRANCH }} \
-              -t ${{ github.event.pull_request.base.repo.full_name }} \
-              ${{ inputs.jobs-folder-path }}
+      ${GITHUB_WORKSPACE}/seed_repo/dsl/seed/scripts/seed_test.sh ${{ inputs.jobs-folder-path }}
   
   - name: Setup upload artifact name
     if: ${{ always() && inputs.save-results }}

diff --git a/.ci/actions/maven/action.yml b/.ci/actions/maven/action.yml
@@ -3,7 +3,7 @@ description: 'Java and Maven version setup'
 inputs:
   java-version:
     description: "the java version"
-    default: 11
+    default: "11"
     required: false
   maven-version:
     description: "the maven version"

diff --git a/.ci/jenkins/dsl/test.sh b/.ci/jenkins/dsl/test.sh
@@ -2,8 +2,4 @@
 
 SCRIPT_DIR_PATH=`dirname "${BASH_SOURCE[0]}"`
 
-export DSL_DEFAULT_MAIN_CONFIG_FILE_REPO=kiegroup/kogito-pipelines
-export DSL_DEFAULT_MAIN_CONFIG_FILE_REF=main
-export DSL_DEFAULT_MAIN_CONFIG_FILE_PATH=dsl/config/main.yaml
-
 ${SCRIPT_DIR_PATH}/../../../dsl/seed/scripts/seed_test.sh $@ 
diff --git a/.github/workflows/jenkins-dsl-downstream.yml b/.github/workflows/jenkins-dsl-downstream.yml
@@ -15,7 +15,7 @@ jobs:
   #############################################################################
   getKogitoDslDownstreamMatrix:
     concurrency:
-      group: kogito_pipelines_pr-dsl_kogito_downstream_matrix-${{ github.head_ref }}
+      group: ${{ github.repository.name }}-dsl_kogito_downstream_matrix-${{ github.head_ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
     name: Get Kogito DSL downstream projects
@@ -35,7 +35,7 @@ jobs:
           yq --version
 
       - name: Checkout Main Config repo from main branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: kiegroup/kogito-pipelines
           ref: main
@@ -98,7 +98,7 @@ jobs:
 
       - name: Checkout branch config repo
         if: ${{ env.BRANCH_CONFIG_UNKNOWN != 'true' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ env.BRANCH_CONFIG_GIT_AUTHOR }}/${{ env.BRANCH_CONFIG_GIT_REPOSITORY }}
           ref: ${{ env.BRANCH_CONFIG_GIT_BRANCH }}
@@ -109,10 +109,9 @@ jobs:
         working-directory: branch_config_repo
         run: |
           matrixArray=''
-          defaultAuthor=kiegroup
+          defaultAuthor=${{ github.event.pull_request.head.user.login }}
           if [ "${{ env.BRANCH_CONFIG_UNKNOWN }}" != "true" ]; then
             matrixArray=$(yq '.repositories[].name' ${{ env.BRANCH_CONFIG_PATH }}) # Creates array of all repositories
-            defaultAuthor=$(yq '.git.author.name' ${{ env.BRANCH_CONFIG_PATH }})
           fi
 
           fullArray=()
@@ -135,12 +134,11 @@ jobs:
           cat ./tmp
 
           # End Generate Json String
-          matrixStringifiedObject=$(cat ./tmp) # Use this as jq @sh wasn't cooperating
-          echo "::set-output name=repositories::$matrixStringifiedObject"
+          echo "repositories=$(cat ./tmp)" >> $GITHUB_OUTPUT # Use this as jq @sh wasn't cooperating
 
   runKogitoDownstreamDslTests:
     concurrency:
-      group: kogito_pipelines_pr-dsl_kogito_downstream_${{ matrix.repository }}_tests-${{ github.head_ref }}
+      group: ${{ github.repository.name }}-dsl_kogito_downstream_${{ matrix.repository }}_tests-${{ github.head_ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
     needs: getKogitoDslDownstreamMatrix
@@ -177,7 +175,7 @@ jobs:
   #############################################################################
   getOptaPlannerDslDownstreamMatrix:
     concurrency:
-      group: kogito_pipelines_pr-dsl_optaplanner_downstream_matrix-${{ github.head_ref }}
+      group: ${{ github.repository.name }}-dsl_optaplanner_downstream_matrix-${{ github.head_ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
     name: Get OptaPlanner DSL downstream projects
@@ -201,7 +199,7 @@ jobs:
           yq --version
 
       - name: Checkout Main Config repo from main branch
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: kiegroup/optaplanner
           ref: main
@@ -266,7 +264,7 @@ jobs:
 
       - name: Checkout branch config repo
         if: ${{ env.BRANCH_CONFIG_UNKNOWN != 'true' }}
-        uses: actions/checkout@v2
+        uses: actions/checkout@v3
         with:
           repository: ${{ env.BRANCH_CONFIG_GIT_AUTHOR }}/${{ env.BRANCH_CONFIG_GIT_REPOSITORY }}
           ref: ${{ env.BRANCH_CONFIG_GIT_BRANCH }}
@@ -277,10 +275,9 @@ jobs:
         working-directory: branch_config_repo
         run: |
           matrixArray=''
-          defaultAuthor=kiegroup
+          defaultAuthor=${{ github.event.pull_request.head.user.login }}
           if [ "${{ env.BRANCH_CONFIG_UNKNOWN }}" != "true" ]; then
             matrixArray=$(yq '.repositories[].name' ${{ env.BRANCH_CONFIG_PATH }}) # Creates array of all repositories
-            defaultAuthor=$(yq '.git.author.name' ${{ env.BRANCH_CONFIG_PATH }})
           fi
 
           fullArray=()
@@ -303,8 +300,7 @@ jobs:
           cat ./tmp
 
           # End Generate Json String
-          matrixStringifiedObject=$(cat ./tmp) # Use this as jq @sh wasn't cooperating
-          echo "::set-output name=repositories::$matrixStringifiedObject"
+          echo "repositories=$(cat ./tmp)" >> $GITHUB_OUTPUT # Use this as jq @sh wasn't cooperating
 
 
   runOtaPlannerDownstreamDslTests:
@@ -314,7 +310,7 @@ jobs:
       matrix: ${{fromJson(needs.getOptaPlannerDslDownstreamMatrix.outputs.matrix)}}
       fail-fast: false
     concurrency:
-      group: kogito_pipelines_pr-dsl_optaplanner_downstream_${{ matrix.repository }}_tests-${{ github.head_ref }}
+      group: ${{ github.repository.name }}-dsl_optaplanner_downstream_${{ matrix.repository }}_tests-${{ github.head_ref }}
       cancel-in-progress: true
     name: OptaPlanner DSL Downstream tests - ${{ matrix.repository }}
     steps:

diff --git a/.github/workflows/jenkins-tests.yml b/.github/workflows/jenkins-tests.yml
@@ -14,26 +14,26 @@ on:
 jobs:
   jenkinsfile-tests:
     concurrency:
-      group: kogito_pipelines_pr-jenkins_tests-${{ github.head_ref }}
+      group: ${{ github.repository.name }}-jenkinsfile_tests-${{ github.head_ref }}
       cancel-in-progress: true
     runs-on: ubuntu-latest
     name: Jenkinsfiles
     steps:
     - name: Checkout 
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         path: main
 
     - name: Checkout shared libraries
-      uses: actions/checkout@v2
+      uses: actions/checkout@v3
       with:
         repository: kiegroup/jenkins-pipeline-shared-libraries
         path: shared-libs
 
     - name: Set up JDK 1.8
       uses: actions/setup-java@v1
       with:
-        java-version: 1.8
+        java-version: 8
 
     - name: Setup pipeline env
       run: cd $GITHUB_WORKSPACE/main/.ci/jenkins/tests && ./setup_pipeline_env.sh
@@ -42,8 +42,11 @@ jobs:
       run: cd $GITHUB_WORKSPACE/main/.ci/jenkins/tests && mvn -B clean test
 
   dsl-tests:
+    concurrency:
+      group: ${{ github.repository.name }}-dsl_tests-${{ github.head_ref }}
+      cancel-in-progress: true
     runs-on: ubuntu-latest
-    steps:    
+    steps:
     - name: DSL tests
       uses: kiegroup/kogito-pipelines/.ci/actions/dsl-tests@main
       with:

diff --git a/dsl/seed/scripts/copy_jobs.sh b/dsl/seed/scripts/copy_jobs.sh