From bcd96cfb12896dff2e38793217af4520a3779117 Mon Sep 17 00:00:00 2001
From: lizkrznarich <liz.krznarich@datacite.org>
Date: Wed, 19 Apr 2023 11:54:59 -0500
Subject: [PATCH] update main branch workflows

---
 .github/workflows/dev_manual_index.yml  |  2 +-
 .github/workflows/main_manual_index.yml | 12 ++++++++++--
 .github/workflows/main_release.yml      |  2 +-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/.github/workflows/dev_manual_index.yml b/.github/workflows/dev_manual_index.yml
index 1d1498690..489e61e27 100644
--- a/.github/workflows/dev_manual_index.yml
+++ b/.github/workflows/dev_manual_index.yml
@@ -122,5 +122,5 @@ jobs:
         with:
           channel: '#ror-curation-releases'
           color: 'good'
-          text: 'DEV index status: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.directory-name }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
+          text: 'DEV index status to ES ${{ github.event.inputs.es-version }}: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.directory-name }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
 
diff --git a/.github/workflows/main_manual_index.yml b/.github/workflows/main_manual_index.yml
index 917dfbe08..62e21211a 100644
--- a/.github/workflows/main_manual_index.yml
+++ b/.github/workflows/main_manual_index.yml
@@ -6,6 +6,14 @@ on:
         type: string
         required: true
         description: Name of the release tag that you would like to deploy to DEV
+      es-version:
+        description: Elastic search version to deploy to
+        required: true
+        default: 7
+        type: choice
+        options:
+          - 6
+          - 7
 env:
   AWS_ACCESS_KEY_ID: ${{ secrets.AWS_ACCESS_KEY_ID }}
   AWS_SECRET_ACCESS_KEY: ${{ secrets.AWS_SECRET_ACCESS_KEY }}
@@ -65,7 +73,7 @@ jobs:
           cd .github/workflows
           python -m pip install --upgrade pip
           pip install requests==2.23.0
-          python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.release-tag }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
+          python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.inputs.release-tag }} -es ${{ github.event.inputs.es-version }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
       - name: Notify Slack
         if: always()
         uses: edge/simple-slack-notify@master
@@ -74,5 +82,5 @@ jobs:
         with:
           channel: '#ror-curation-releases'
           color: 'good'
-          text: 'DEV index status: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.release-tag }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
+          text: 'DEV index status to ES ${{ github.event.inputs.es-version }}: ${{ steps.indexdata.outcome }}. From directory: ${{ github.event.inputs.release-tag }}. Please check: ${env.GITHUB_SERVER_URL}/${env.GITHUB_REPOSITORY}/actions/runs/${env.GITHUB_RUN_ID}'
 
diff --git a/.github/workflows/main_release.yml b/.github/workflows/main_release.yml
index 42bf6ce5d..bddb4f7c1 100644
--- a/.github/workflows/main_release.yml
+++ b/.github/workflows/main_release.yml
@@ -67,7 +67,7 @@ jobs:
           cd .github/workflows
           python -m pip install --upgrade pip
           pip install requests==2.23.0
-          python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.release.tag_name }} -he ${{ secrets.INDEX_DEV_API_HEADERS }}
+          python index_files.py -u ${{ secrets.INDEX_DEV_API_URL }} -d ${{ github.event.release.tag_name }} -es 7 -he ${{ secrets.INDEX_DEV_API_HEADERS }}
       - name: Notify Slack
         if: always()
         uses: edge/simple-slack-notify@master