fix conflicts

Author: mnoman09

.github/workflows/integration_test.yml

@@ -15,7 +15,7 @@ jobs:
   test:
     runs-on: ubuntu-latest
     steps:
-    - uses: actions/checkout@v2
+    - uses: actions/checkout@v3
       with:
         # You should create a personal access token and store it in your repository
         token: ${{ secrets.CI_USER_TOKEN }}
@@ -39,15 +39,15 @@ jobs:
         BUILD_NUMBER: ${{ github.run_id }}
         TESTAPP_BRANCH: master
         GITHUB_TOKEN: ${{ secrets.CI_USER_TOKEN }}
-        TRAVIS_EVENT_TYPE: ${{ github.event_name }}
+        EVENT_TYPE: ${{ github.event_name }}
         GITHUB_CONTEXT: ${{ toJson(github) }}
-        TRAVIS_REPO_SLUG: ${{ github.repository }}
-        TRAVIS_PULL_REQUEST_SLUG: ${{ github.repository }}
+        #REPO_SLUG: ${{ github.repository }}
+        PULL_REQUEST_SLUG: ${{ github.repository }}
         UPSTREAM_REPO: ${{ github.repository }}
-        TRAVIS_COMMIT: ${{ github.sha }}
-        TRAVIS_PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}
-        TRAVIS_PULL_REQUEST: ${{ github.event.pull_request.number }}
+        PULL_REQUEST_SHA: ${{ github.event.pull_request.head.sha }}
+        PULL_REQUEST_NUMBER: ${{ github.event.pull_request.number }}
         UPSTREAM_SHA: ${{ github.sha }}
+        TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
         TRAVIS_COM_TOKEN: ${{ secrets.TRAVIS_COM_TOKEN }}
         EVENT_MESSAGE: ${{ github.event.message }}
         HOME: 'home/runner'