Merged PR 417: indexer: rename service name from indexer-service to os-indexer...

Merged PR 417: indexer: rename service name from indexer-service to os-indexer to match task queue settings.

indexer: rename service name from indexer-service to os-indexer to match task queue settings.
Re-enabled previously ignored integration tests.

Related work items: #317

provider/indexer-gcp/scripts/deploy2gcp.sh.tmpl

@@ -40,9 +40,9 @@ echo "  Directory = $DEPLOY_DIR"
 VERSION_NUMBER=$BUILD_BUILDNUMBER
 VERSION_NUMBER=$(echo "$VERSION_NUMBER" | tr _ - | tr . - | tr '[:upper:]' '[:lower:]')
 
-count=$(gcloud app services list --project $PROJECT_ID | grep indexer-service | wc -l)
+count=$(gcloud app services list --project $PROJECT_ID | grep os-indexer | wc -l)
 if [ $count -gt 0 ]; then
-  CURRENT_VERSION=$(gcloud app services describe indexer-service --project $PROJECT_ID --format=json | jq --raw-output '.split.allocations | keys[0]')
+  CURRENT_VERSION=$(gcloud app services describe os-indexer --project $PROJECT_ID --format=json | jq --raw-output '.split.allocations | keys[0]')
 else
   CURRENT_VERSION=""
 fi
@@ -52,7 +52,7 @@ echo "Version to be deployed = $VERSION_NUMBER"
 
 if [ "$VERSION_NUMBER" != "$CURRENT_VERSION" -o "$BUILD_FORCE_DEPLOY" = "true" ]
 then
-    SERVICE_NAME="indexer-service"
+    SERVICE_NAME="os-indexer"
     # If the version $VERSION_NUMBER already exists, but not serving traffic, gcloud app deploy will fail. In this case, simply start that version and migrate traffic to it
     doesVersionExist=`gcloud app versions list --service=$SERVICE_NAME --project=$PROJECT_ID | grep $VERSION_NUMBER | wc -l`
     if [ "$doesVersionExist" -eq "1" ]
@@ -62,7 +62,7 @@ then
         echo "Migrating all traffic to version $VERSION_NUMBER"
         gcloud app services set-traffic $SERVICE_NAME --splits $VERSION_NUMBER=1 --project=$PROJECT_ID --quiet
     else
-        export INDEXER_HOSTNAME="indexer-service-dot-$PROJECT_ID.appspot.com"
+        export INDEXER_HOSTNAME="os-indexer-dot-$PROJECT_ID.appspot.com"
 
         echo "Replacing GOOGLE_CLOUD_PROJECT_PLACE_HOLDER with $PROJECT_ID"
         sed -i "s|GOOGLE_CLOUD_PROJECT_PLACE_HOLDER|$PROJECT_ID|g" app.yaml

provider/indexer-gcp/src/main/appengine/app.yaml

@@ -12,7 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-service: indexer-service
+service: os-indexer
 
 runtime: java
 env: flex

testing/indexer-test-gcp/src/test/java/org/opengroup/osdu/step_definitions/index/record/RunTest.java

@@ -2,11 +2,8 @@ package org.opengroup.osdu.step_definitions.index.record;
 
 import cucumber.api.CucumberOptions;
 import cucumber.api.junit.Cucumber;
-import org.junit.Ignore;
 import org.junit.runner.RunWith;
 
-
-@Ignore
 @RunWith(Cucumber.class)
 @CucumberOptions(
         features = "src/test/resources/features/indexrecord/IndexRecord.feature",