Skip to content

Commit

Permalink
Step Eiffel components versions (#40)
Browse files Browse the repository at this point in the history 
* Stepped several Eiffel component versions in Eiffel bundle.

* Fix wrong port number server.port for remrem-generate.
  • Loading branch information
@tobiasake
tobiasake authored Jan 3, 2020
1 parent 0bfc612 commit 4999041
Show file tree
Hide file tree
Showing 8 changed files with 16 additions and 20 deletions.
2 changes: 1 addition & 1 deletion bundles/Eiffel/K8S/k8s_bundle_functions.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -251,7 +251,7 @@ function execute_k8s_command_on_services {
local settings=(
image.registry="$EXTERNAL_DOCKER_REGISTRY"
image.repository="$EIFFEL_JENKINS_IMAGE_TAG_NAME"
image.tag="$EIFFEL_JENKINS_IMAGE_BUILD_VERSION"
image.tag="$JENKINS_VERSION"
ingress.hostName="$K8S_INGRESS_EIFFEL_JENKINS"
eiffel.configurationEnvironmentVars="$K8S_CONFIG_EIFFEL_JENKINS"
ingress.enabled="$K8S_Ingress_Enabled"
Expand Down
5 changes: 3 additions & 2 deletions bundles/Eiffel/build-source/docker-compose.yml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,13 @@ services:
context: ./
dockerfile: ./jenkins/Dockerfile
args:
JENKINS_VERSION: ${EIFFEL_JENKINS_IMAGE_BUILD_VERSION}
JENKINS_VERSION: ${JENKINS_VERSION}

jenkins_fem:
image: ${EIFFEL_JENKINS_FEM_IMAGE_TAG_NAME}
build:
context: ./
dockerfile: ./eiffel-jenkins/Dockerfile
args:
JENKINS_VERSION: ${EIFFEL_JENKINS_FEM_IMAGE_TAG_NAME}
JENKINS_VERSION: ${EIFFEL_JENKINS_IMAGE_BUILD_VERSION}
FEM_PLUGIN_VERSION: ${EIFFEL_JENKINS_PLUGIN_VERSION}
Empty file modified bundles/Eiffel/build-source/eiffel-jenkins/generate-fem-settings.sh
100644 → 100755
View file
Empty file.
Empty file modified bundles/Eiffel/build-source/eiffel-jenkins/security.groovy
100644 → 100755
View file
Empty file.
11 changes: 3 additions & 8 deletions bundles/Eiffel/build-source/eiffel-jenkins/send_eiffel2_event.xml.template
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@
"msgParams": {
"meta": {
"type": "EiffelArtifactCreatedEvent",
"version": "1.1.0",
"version": "3.0.0",
"tags": [],
"source": {
"domainId": "example.domain"
Expand All @@ -45,15 +45,10 @@
},
"eventParams": {
"data": {
"gav": {
"groupId": "com.othercompany.library",
"artifactId": "required",
"version": "required"
},
"identity": "pkg:maven/com.othercompany.library/required@required",
"fileInformation": [
{
"classifier": "exec",
"extension": "jar"
"name": "required.jar"
}
],
"buildCommand": "",
Expand Down
Empty file modified bundles/Eiffel/build-source/eiffel-jenkins/start-service.sh
100644 → 100755
View file
Empty file.
16 changes: 8 additions & 8 deletions bundles/Eiffel/component-versions.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,19 +15,19 @@
# limitations under the License.
#
# Eiffel Component versions
export EIFFEL_MONGODB_VERSION=latest
export EIFFEL_RABBITMQ_VERSION=3.7.8-debian-9
export EIFFEL_MONGODB_VERSION=4.0.14
export EIFFEL_RABBITMQ_VERSION=3.8.2
export EIFFEL_EI_BACKEND_VERSION=2.0.1
export EIFFEL_EI_FRONTEND_VERSION=2.0.0
export EIFFEL_VICI_VERSION=0.0.1
export EIFFEL_DUMMY_ER_VERSION=latest
export EIFFEL_ER_VERSION=2.0.19
export EIFFEL_REMREM_GENERATE_VERSION=2.0.9
export EIFFEL_REMREM_PUBLISH_VERSION=2.0.8
export EIFFEL_JENKINS_IMAGE_BUILD_VERSION=2.150.2
export EIFFEL_JENKINS_PLUGIN_VERSION=2.0.0
export EIFFEL_REMREM_GENERATE_VERSION=2.0.10
export EIFFEL_REMREM_PUBLISH_VERSION=2.0.11
export EIFFEL_JENKINS_IMAGE_BUILD_VERSION=2.190.1
export EIFFEL_JENKINS_PLUGIN_VERSION=2.0.16
export EIFFEL_NEXUS_VERSION=3.11.0

export JENKINS_VERSION=2.150.2

# Docker Registry
#export ERICSSON_INTERNAL_SELI_DOCKER_REGISTRY=xxxxxxxxxxx
Expand Down Expand Up @@ -58,7 +58,7 @@ export EIFFEL_DUMMY_ER_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_DUMMY_ER_I
export EIFFEL_ER_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_ER_IMAGE_TAG_NAME}:${EIFFEL_ER_VERSION}
export EIFFEL_REMREM_GENERATE_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_REMREM_GENERATE_IMAGE_TAG_NAME}:${EIFFEL_REMREM_GENERATE_VERSION}
export EIFFEL_REMREM_PUBLISH_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_REMREM_PUBLISH_IMAGE_TAG_NAME}:${EIFFEL_REMREM_PUBLISH_VERSION}
export EIFFEL_JENKINS_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_JENKINS_IMAGE_TAG_NAME}:${EIFFEL_JENKINS_IMAGE_BUILD_VERSION}
export EIFFEL_JENKINS_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_JENKINS_IMAGE_TAG_NAME}:${JENKINS_VERSION}
export EIFFEL_JENKINS_FEM_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_JENKINS_FEM_IMAGE_TAG_NAME}:${EIFFEL_JENKINS_PLUGIN_VERSION}
export EIFFEL_NEXUS_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_NEXUS_IMAGE_TAG_NAME}:${EIFFEL_NEXUS_VERSION}

2 changes: 1 addition & 1 deletion bundles/Eiffel/components-configuration.bash
View file
Original file line number Diff line number Diff line change
Expand Up @@ -513,7 +513,7 @@ WAIT_MB_HOSTS=$EIFFEL_RABBITMQ:${EIFFEL_RABBITMQ_WEB_APPLICATION_PORT}"
### RemRem-Generate service ###

export CONFIG_EIFFEL_REMREM_GENERATE="
server.port=${EIFFEL_REMREM_GENERATE_EXTERNAL_PORT}
server.port=${EIFFEL_REMREM_GENERATE_INTERNAL_PORT}
jasypt.encryptor.password=
activedirectory.generate.enabled=false
activedirectory.ldapUrl=
Expand Down

0 comments on commit 4999041

Please sign in to comment.