Merge branch 'data/add_accessionHolder' into 'master'

Update forest accession holders and correct bug in country data. GNP-5796.

See merge request urgi-is/data-discovery!306

.gitlab-ci.yml

@@ -60,8 +60,7 @@ deploy-synonyms-to-prod-cluster-proxmox:
   - eval $(ssh-agent -k)
  only:
   changes:
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
   refs:
    - master
 
@@ -78,8 +77,7 @@ deploy-synonyms-to-dev-cluster-openstack:
   - eval $(ssh-agent -k)
  only:
   changes:
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
   refs:
    - branches
  except:
@@ -729,6 +727,7 @@ data-integration-rare-beta-openstack:
   changes:
    - data/rare/*.json.gz
    - data/rare/suggestions/rare_bulk*.json.gz
+   - scripts/*
   refs:
    - branches
  except:
@@ -745,6 +744,7 @@ data-integration-rare-staging-openstack:
   changes:
    - data/rare/*.json.gz
    - data/rare/suggestions/rare_bulk*.json.gz
+   - scripts/*
   refs:
    - branches
  except:
@@ -760,6 +760,7 @@ data-integration-rare-prod-proxmox:
   changes:
    - data/rare/*.json.gz
    - data/rare/suggestions/rare_bulk*.json.gz
+   - scripts/*
   refs:
    - master
 
@@ -774,6 +775,7 @@ data-integration-rare-prod-openstack:
   changes:
    - data/rare/*.json.gz
    - data/rare/suggestions/rare_bulk*.json.gz
+   - scripts/*
   refs:
    - master
 
@@ -787,6 +789,7 @@ data-integration-rare-with-basket-beta-openstack:
   changes:
    - data/rare/*.json.gz
    - data/rare/suggestions/rare-with-basket_bulk*.json.gz
+   - scripts/*
   refs:
    - branches
  except:
@@ -803,6 +806,7 @@ data-integration-rare-with-basket-staging-openstack:
   changes:
    - data/rare/*.json.gz
    - data/rare/suggestions/rare-with-basket_bulk*.json.gz
+   - scripts/*
   refs:
    - branches
  except:
@@ -821,6 +825,7 @@ data-integration-rare-with-basket-prod-openstack:
   changes:
    - data/rare/*.json.gz
    - data/rare/suggestions/rare-with-basket_bulk*.json.gz
+   - scripts/*
   refs:
    - master
 
@@ -834,8 +839,8 @@ data-integration-wheatis-beta-openstack:
   changes:
    - data/wheatis/*.json.gz
    - data/wheatis/suggestions/wheatis_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - branches
  except:
@@ -852,8 +857,8 @@ data-integration-wheatis-staging-openstack:
   changes:
    - data/wheatis/*.json.gz
    - data/wheatis/suggestions/wheatis_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - branches
  except:
@@ -869,8 +874,8 @@ data-integration-wheatis-prod-proxmox:
   changes:
    - data/wheatis/*.json.gz
    - data/wheatis/suggestions/wheatis_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - master
 
@@ -885,8 +890,8 @@ data-integration-wheatis-prod-openstack:
   changes:
    - data/wheatis/*.json.gz
    - data/wheatis/suggestions/wheatis_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - master
 
@@ -900,8 +905,8 @@ data-integration-data-discovery-beta-openstack:
   changes:
    - data/data-discovery/*.json.gz
    - data/data-discovery/suggestions/data-discovery_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - branches
  except:
@@ -918,8 +923,8 @@ data-integration-data-discovery-staging-openstack:
   changes:
    - data/data-discovery/*.json.gz
    - data/data-discovery/suggestions/data-discovery_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - branches
  except:
@@ -935,8 +940,8 @@ data-integration-data-discovery-prod-proxmox:
   changes:
    - data/data-discovery/*.json.gz
    - data/data-discovery/suggestions/data-discovery_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - master
 
@@ -951,7 +956,7 @@ data-integration-data-discovery-prod-openstack:
   changes:
    - data/data-discovery/*.json.gz
    - data/data-discovery/suggestions/data-discovery_bulk*.json.gz
-   - data/synonyms/all_autophrases.txt*
-   - data/synonyms/all_synonyms.txt*
+   - data/synonyms/all_*
+   - scripts/*
   refs:
    - master

scripts/index.sh

@@ -84,7 +84,7 @@ curl -s -m 5 ${ES_HOST}:${ES_PORT} > /dev/null
 }
 
 # Get previous existing timestamps
-PREVIOUS_TIMESTAMPS=$(curl -s "${ES_HOST}:${ES_PORT}/_cat/indices/${APP_NAME}*${APP_ENV}-tmstp*" | "${SED_CMD}" -r "s/.*-tmstp([0-9]+).*/\1/g" | sort -ru | grep -v "$TIMESTAMP")
+PREVIOUS_TIMESTAMPS=$(curl -s "${ES_HOST}:${ES_PORT}/_cat/indices/${APP_NAME}-${APP_ENV}-tmstp*" | "${SED_CMD}" -r "s/.*-tmstp([0-9]+).*/\1/g" | sort -ru | grep -v "$TIMESTAMP")
 
 # Create index, aliases with their mapping
 $SHELL "${BASEDIR}"/createIndexAndAliases4CI.sh -host "$ES_HOST" -port "$ES_PORT" -app "$APP_NAME" -env "$APP_ENV" -timestamp "$TIMESTAMP"