-
Notifications
You must be signed in to change notification settings - Fork 1
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
#135 fallback language in suggest + parents
- Loading branch information
Showing
17 changed files
with
452 additions
and
84 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -112,7 +112,7 @@ pipeline { | |
when { | ||
allOf { | ||
not { expression { params.RELEASE } }; | ||
branch 'dev'; | ||
branch 'dev_jdk8'; | ||
} | ||
} | ||
steps { | ||
|
@@ -147,6 +147,51 @@ pipeline { | |
} | ||
} | ||
} | ||
stage('Deploy to DEV2') { | ||
environment { | ||
GIT_CREDENTIALS = credentials('4b740850-d7e0-4ab2-9eee-ecd1607e1e02') | ||
SERVICE_VOCABULARY = "${env.WORKSPACE}/service-vocabulary.yml" | ||
HOSTS_VOCABULARY = "${env.WORKSPACE}/hosts-vocabulary" | ||
BUILD_HOSTS = "${BUILD_ID}_hosts" | ||
} | ||
when { | ||
allOf { | ||
not { expression { params.RELEASE } }; | ||
branch 'dev'; | ||
} | ||
} | ||
steps { | ||
sshagent(['85f1747d-ea03-49ca-9e5d-aa9b7bc01c5f']) { | ||
sh ''' | ||
rm -rf * | ||
git clone -b master [email protected]:gbif/gbif-configuration.git | ||
git clone -b master [email protected]:gbif/c-deploy.git | ||
''' | ||
|
||
createServiceFile("${env.WORKSPACE}/gbif-configuration/environments/dev2/services.yml") | ||
createHostsFile() | ||
|
||
sh """ | ||
cd c-deploy/services | ||
echo "Creating group_vars directory" | ||
mkdir group_vars | ||
# Configuration and services files are concatenated into a single file, that will contain the Ansible variables | ||
cat ../../gbif-configuration/environments/dev2/configuration.yml \ | ||
../../gbif-configuration/environments/dev2/monitoring.yml \ | ||
${SERVICE_VOCABULARY} >> group_vars/${BUILD_ID} | ||
# The default Ansible inventory file 'hosts' is concatenated with the input HOSTS file | ||
cat ../../gbif-configuration/environments/dev2/hosts \ | ||
${HOSTS_VOCABULARY} >> ${BUILD_HOSTS} | ||
# Executes the Ansible playbook | ||
echo "Executing Ansible playbook" | ||
ansible-playbook -vvv -i ${BUILD_HOSTS} services.yml --private-key=~/.ssh/id_rsa --extra-vars "git_credentials=${GIT_CREDENTIALS}" | ||
""" | ||
} | ||
} | ||
} | ||
} | ||
post { | ||
failure { | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
15 changes: 15 additions & 0 deletions
15
core/src/main/java/org/gbif/vocabulary/persistence/dto/ParentDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
package org.gbif.vocabulary.persistence.dto; | ||
|
||
import lombok.Data; | ||
|
||
import org.gbif.vocabulary.model.LanguageRegion; | ||
|
||
@Data | ||
public class ParentDto { | ||
long key; | ||
String name; | ||
int depth; | ||
Long labelKey; | ||
LanguageRegion labelLanguage; | ||
String labelValue; | ||
} |
16 changes: 16 additions & 0 deletions
16
core/src/main/java/org/gbif/vocabulary/persistence/dto/SuggestDto.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,16 @@ | ||
package org.gbif.vocabulary.persistence.dto; | ||
|
||
import org.gbif.vocabulary.model.Label; | ||
|
||
import java.util.List; | ||
|
||
import lombok.Data; | ||
|
||
@Data | ||
public class SuggestDto { | ||
|
||
private long key; | ||
private String name; | ||
private List<Label> labels; | ||
private List<ParentDto> parentDtos; | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,3 +1,3 @@ | ||
mybatis.type-handlers-package=org.gbif.vocabulary.persistence.handlers | ||
mybatis.type-aliases-package=org.gbif.vocabulary.model;org.gbif.vocabulary.persistence.handlers | ||
mybatis.configuration.map-underscore-to-camel-case=true | ||
mybatis.type-aliases-package=org.gbif.vocabulary.model;org.gbif.vocabulary.persistence.handlers;org.gbif.vocabulary.persistence.dto | ||
mybatis.configuration.map-underscore-to-camel-case=true |
Oops, something went wrong.