Remove separate CI steps for sklearnex preview

.ci/pipeline/build-and-test-lnx.yml

@@ -88,17 +88,6 @@ steps:
       TBBROOT: ${{ variables.TBBROOT }}
       COVERAGE_RCFILE: ${{ variables.COVERAGE_RCFILE }}
       NO_DPC: ${{ variables.NO_DPC }}
-    displayName: "Sklearn testing"
-    condition: succeededOrFailed()
-  - script: |
-      . /usr/share/miniconda/etc/profile.d/conda.sh
-      conda activate CB
-      if [ -n "${TBBROOT}" ] && [ "${TBBROOT}" != "${CONDA_PREFIX}" ]; then source ${TBBROOT}/env/vars.sh; fi
-      if [ -z "${NO_DPC}" ]; then export CPU="cpu"; fi
-      bash .ci/scripts/run_sklearn_tests.sh $CPU
-    env:
-      TBBROOT: ${{ variables.TBBROOT }}
-      NO_DPC: ${{ variables.NO_DPC }}
       SKLEARNEX_PREVIEW: "YES"
-    displayName: "Sklearn testing [preview]"
+    displayName: "Sklearn testing"
     condition: succeededOrFailed()

.ci/pipeline/build-and-test-mac.yml

@@ -48,15 +48,10 @@ steps:
       cd ..
       ./s/conda-recipe/run_test.sh
     displayName: 'Sklearnex testing'
-  - script: |
-      source activate CB
-      bash .ci/scripts/run_sklearn_tests.sh
-    displayName: 'Sklearn testing'
-    condition: succeededOrFailed()
   - script: |
       source activate CB
       bash .ci/scripts/run_sklearn_tests.sh
     env:
       SKLEARNEX_PREVIEW: "YES"
-    displayName: 'Sklearn testing [preview]'
+    displayName: 'Sklearn testing'
     condition: succeededOrFailed()

.ci/pipeline/build-and-test-win.yml

@@ -71,18 +71,8 @@ steps:
       bash .ci/scripts/run_sklearn_tests.sh
     displayName: 'Sklearn testing'
     condition: succeededOrFailed()
-    env:
-      COVERAGE_RCFILE: ${{ variables.COVERAGE_RCFILE }}
-      DALROOT: ${{ variables.DALROOT }}
-      TBBROOT: ${{ variables.TBBROOT }}
-  - script: |
-      call activate CB
-      if defined DALROOT call "%DALROOT%\env\vars.bat"
-      if defined TBBROOT call "%TBBROOT%\env\vars.bat"
-      bash .ci/scripts/run_sklearn_tests.sh
     env:
       SKLEARNEX_PREVIEW: "YES"
+      COVERAGE_RCFILE: ${{ variables.COVERAGE_RCFILE }}
       DALROOT: ${{ variables.DALROOT }}
       TBBROOT: ${{ variables.TBBROOT }}
-    displayName: 'Sklearn testing [preview]'
-    condition: succeededOrFailed()

.github/workflows/ci.yml

@@ -154,6 +154,7 @@ jobs:
           source venv/bin/activate
           source .github/scripts/activate_components.sh
           export COVERAGE_FILE=$(pwd)/.coverage.sklearn
+          export SKLEARNEX_PREVIEW='YES'
           if [ "${{ steps.set-env.outputs.DPCFLAG }}" == "" ]; then export CPU=cpu; fi
           bash .ci/scripts/run_sklearn_tests.sh $CPU
       - name: Create coverage report
@@ -167,13 +168,6 @@ jobs:
           name: coverage_lnx_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}
           path: |
             *_lnx${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.info
-      - name: Sklearn testing [preview]
-        run: |
-          source venv/bin/activate
-          source .github/scripts/activate_components.sh
-          if [ "${{ steps.set-env.outputs.DPCFLAG }}" == "" ]; then export CPU=cpu; fi
-          export SKLEARNEX_PREVIEW='YES'
-          bash .ci/scripts/run_sklearn_tests.sh $CPU
 
   sklearn_win:
     needs: onedal_nightly
@@ -295,6 +289,7 @@ jobs:
           call .\venv\Scripts\activate.bat
           call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
           set COVERAGE_FILE=%cd%\.coverage.sklearn
+          set SKLEARNEX_PREVIEW=YES
           if "${{ steps.set-env.outputs.DPCFLAG }}"=="" set CPU=cpu
           bash .ci/scripts/run_sklearn_tests.sh %CPU%
       - name: Create coverage report
@@ -309,14 +304,6 @@ jobs:
           name: coverage_win_Py${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}
           path: |
              *_win${{ matrix.PYTHON_VERSION }}_${{ matrix.SKLEARN_VERSION }}.info
-      - name: Sklearn testing [preview]
-        shell: cmd
-        run: |
-          call .\venv\Scripts\activate.bat
-          call .\.github\scripts\activate_components.bat ${{ steps.set-env.outputs.DPCFLAG }}
-          if "${{ steps.set-env.outputs.DPCFLAG }}"=="" set CPU=cpu
-          set SKLEARNEX_PREVIEW=YES
-          bash .ci/scripts/run_sklearn_tests.sh %CPU%
 
   build_uxl:
     if: github.repository == 'uxlfoundation/scikit-learn-intelex'
@@ -480,6 +467,7 @@ jobs:
         run: |
           source .github/scripts/activate_components.sh
           export COVERAGE_FILE=$(pwd)/.coverage.sklearn
+          export SKLEARNEX_PREVIEW='YES'
           bash .ci/scripts/run_sklearn_tests.sh ${{ matrix.DEVICE }}
       - name: Create coverage report
         run: |
@@ -491,8 +479,3 @@ jobs:
           name: coverage_uxl_lnx_${{ matrix.DEVICE }}
           path: |
             *uxl_lnx_${{ matrix.DEVICE }}.info
-      - name: Sklearn testing [preview]
-        run: |
-          source .github/scripts/activate_components.sh
-          export SKLEARNEX_PREVIEW='YES'
-          bash .ci/scripts/run_sklearn_tests.sh ${{ matrix.DEVICE }}