From f007bfb4cf64ae1224a266f0f5b8c6c3f3ceb046 Mon Sep 17 00:00:00 2001
From: mehrdadn <mehrdadn@users.noreply.github.com>
Date: Tue, 9 Jun 2020 11:07:14 -0700
Subject: [PATCH] Merge Jenkins workflow into main workflow (#8848)

Co-authored-by: Mehrdad <noreply@github.com>
---
 .github/workflows/jenkins.yml | 26 --------------------------
 .github/workflows/main.yml    | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 26 deletions(-)
 delete mode 100644 .github/workflows/jenkins.yml

diff --git a/.github/workflows/jenkins.yml b/.github/workflows/jenkins.yml
deleted file mode 100644
index 565289698..000000000
--- a/.github/workflows/jenkins.yml
+++ /dev/null
@@ -1,26 +0,0 @@
-name: Jenkins Integration
-
-env:
-  DEBIAN_FRONTEND: noninteractive
-
-on: [push, pull_request]
-
-jobs:
-  jenkins:
-    name: docker integration
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        test-case: ["RUN_TUNE_TESTS", "RUN_DOC_TESTS", "RUN_SGD_TESTS"]
-      fail-fast: false
-    steps:
-      - name: Checkout repository
-        uses: actions/checkout@v1
-        with:
-          fetch-depth: 0
-      - name: Run Jenkins Tests
-        shell: bash -e -o pipefail -l {0}
-        env:
-          SIGOPT_KEY: ${{ secrets.TUNE_SIGOPT_KEY }}
-          TEST_CASE: ${{ matrix.test-case }}
-        run: export $TEST_CASE=1 && HOME=$(pwd) ./ci/jenkins_tests/entry_point.sh
\ No newline at end of file
diff --git a/.github/workflows/main.yml b/.github/workflows/main.yml
index 7f01baa92..451e29492 100644
--- a/.github/workflows/main.yml
+++ b/.github/workflows/main.yml
@@ -26,6 +26,15 @@ jobs:
           - name: macos
             os: macos-10.15
             python-version: 3.6
+          - name: ubuntu-jenkins-tune
+            os: ubuntu-latest
+            jenkins-test: RUN_TUNE_TESTS
+          - name: ubuntu-jenkins-doc
+            os: ubuntu-latest
+            jenkins-test: RUN_DOC_TESTS
+          - name: ubuntu-jenkins-sgd
+            os: ubuntu-latest
+            jenkins-test: RUN_SGD_TESTS
     env:
       PYTHON: ${{ matrix.python-version }}
       TRAVIS_COMMIT: ${{ github.sha }}
@@ -55,8 +64,16 @@ jobs:
         aws-access-key-id: ${{ secrets.GHA_AWS_ACCESS_KEY_ID }}
         aws-secret-access-key: ${{ secrets.GHA_AWS_SECRET_ACCESS_KEY }}
         aws-region: us-west-2
+    - name: Run Jenkins tests
+      shell: bash -e -o pipefail -l {0}
+      if: matrix.jenkins-test != ''
+      env:
+        SIGOPT_KEY: ${{ secrets.TUNE_SIGOPT_KEY }}
+        TEST_CASE: ${{ matrix.jenkins-test }}
+      run: env "${TEST_CASE}=1" HOME="${PWD}" ci/jenkins_tests/entry_point.sh
     - name: Run CI script
       shell: bash -e -o pipefail -l {0}
+      if: matrix.jenkins-test == ''
       env:
         BAZEL_CACHE_CREDENTIAL_B64: ${{ secrets.BAZEL_CACHE_CREDENTIAL_B64 }}
         GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}