diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml index 2184fc6..02466e6 100644 --- a/.github/workflows/ci.yaml +++ b/.github/workflows/ci.yaml @@ -3,10 +3,10 @@ name: easy2use-ci on: push: branches: - - master + - issue-87 pull_request: branches: - - master + - issue-87 env: DOMAIN: eiffel4eiffel.nordix.org diff --git a/bundles/Cx/README.md b/bundles/Cx/README.md index b580e4e..b2ccf20 100644 --- a/bundles/Cx/README.md +++ b/bundles/Cx/README.md @@ -71,7 +71,6 @@ Dependent Components Included from Eiffel Bundle - RemRem Generate - RemRem Publish - Event Repository REST API -- Eiffel-Vici - Eiffel Intelligence artifact Usage diff --git a/bundles/Cx/config-bundle.bash b/bundles/Cx/config-bundle.bash index 39b3828..7cf6129 100644 --- a/bundles/Cx/config-bundle.bash +++ b/bundles/Cx/config-bundle.bash @@ -111,7 +111,7 @@ export CX_JENKINS_CONFIG_SECRETS_PATH=charts/charts_values/jenkins_secrets/ # - OBS no spaces allowed!! # -CONF_Cx_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,ei_backend_artifact,ei_frontend,vici,dummy_er" +CONF_Cx_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,ei_backend_artifact,ei_frontend,dummy_er" # ------------------------------ diff --git a/bundles/Eiffel/K8S/charts/charts_values/eiffel-vici-values.yaml b/bundles/Eiffel/K8S/charts/charts_values/eiffel-vici-values.yaml deleted file mode 100644 index 8957ff6..0000000 --- a/bundles/Eiffel/K8S/charts/charts_values/eiffel-vici-values.yaml +++ /dev/null @@ -1,155 +0,0 @@ -# -# Copyright 2019 Ericsson AB. -# For a full list of individual contributors, please see the commit history. -# -# Licensed under the Apache License, Version 2.0 (the "License"); -# you may not use this file except in compliance with the License. -# You may obtain a copy of the License at -# -# http://www.apache.org/licenses/LICENSE-2.0 -# -# Unless required by applicable law or agreed to in writing, software -# distributed under the License is distributed on an "AS IS" BASIS, -# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -# See the License for the specific language governing permissions and -# limitations under the License. -# -##------------------------------------------------------------------------------------- -## Eiffel eiffel-vici Helm values -## -## Author: michael.frick@ericsson.com -## -##-------------------------------------------------------------------------------------- -fullnameOverride: injected -image: - registry: injected - repository: injected - tag: injected - - ## set to true if you would like to see extra information on logs - ## it turns BASH and NAMI debugging in minideb - ## ref: https://github.com/bitnami/minideb-extras/#turn-on-bash-debugging - debug: false - - ## Specify a imagePullPolicy - ## Defaults to 'Always' if image tag is 'latest', else set to 'IfNotPresent' - ## ref: http://kubernetes.io/docs/user-guide/images/#pre-pulling-images - ## - pullPolicy: Always - ## Optionally specify an array of imagePullSecrets. - ## Secrets must be manually created in the namespace. - ## ref: https://kubernetes.io/docs/tasks/configure-pod-container/pull-image-private-registry/ - ## - # pullSecrets: - # - myRegistrKeySecretName - -## does your cluster have rbac enabled? assume yes by default -rbacEnabled: false - -## section of specific values for eiffel -eiffel: - # Serviceport and ingress mapping to service - servicePort: 8092 - - # POD container port and portname for mapping to service - containerPort: 8080 - containerPortName: vici - - # Nodeport proxy - nodePort: - - # Volume Mount Path to ConfigMap - volumeMountPath: /deployments/config - - - ## Disk free limit - diskFreeLimit: '"6GiB"' - - ## Environment Variable Configuration - configurationEnvironmentVars: | - - ## Configuration file content - for spring-boot application.properties injection - configuration: |- - - - -## Kubernetes service type -serviceType: ClusterIP - -persistence: - ## this enables PVC templates that will create one per pod - enabled: false - - storageClass: "erikube-nfs" - accessMode: ReadWriteOnce - - # If you change this value, you might have to adjust `eiffel.diskFreeLimit` as well. - size: 8Gi - -## Configure resource requests and limits -## ref: http://kubernetes.io/docs/user-guide/compute-resources/ -## -resources: {} - -## Replica count, set to 1 to provide a default available cluster -replicas: 1 - -## Node labels and tolerations for pod assignment -## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#nodeselector -## ref: https://kubernetes.io/docs/concepts/configuration/assign-pod-node/#taints-and-tolerations-beta-feature -nodeSelector: {} -tolerations: [] -affinity: {} - -## annotations for eiffel pods -podAnnotations: {} - -## Configure the ingress resource that allows you to access the -## Wordpress installation. Set up the URL -## ref: http://kubernetes.io/docs/user-guide/ingress/ -## -ingress: - ## Set to true to enable ingress record generation - enabled: true - - ## The list of hostnames to be covered with this ingress record. - ## Most likely this will be just one host, but in the event more hosts are needed, this is an array - hostName: injected - - ## Set this to true in order to enable TLS on the ingress record - ## A side effect of this will be that the backend wordpress service will be connected at port 443 - tls: false - - ## If TLS is set to true, you must declare what secret will store the key/certificate for TLS - tlsSecret: myTlsSecret - - ## Ingress annotations done as key:value pairs - ## If you're using kube-lego, you will want to add: - ## kubernetes.io/tls-acme: true - ## - ## For a full list of possible ingress annotations, please see - ## ref: https://github.com/kubernetes/ingress-nginx/blob/master/docs/annotations.md - ## - ## If tls is set to true, annotation ingress.kubernetes.io/secure-backends: "true" will automatically be set - annotations: - # kubernetes.io/ingress.class: nginx - # kubernetes.io/tls-acme: true - -## The following settings are to configure the frequency of the lifeness and readiness probes -livenessProbe: - enabled: false - initialDelaySeconds: 300 - timeoutSeconds: 10 - failureThreshold: 6 - port: 8080 - path: /health - scheme: HTTP - -readinessProbe: - enabled: false - initialDelaySeconds: 240 - timeoutSeconds: 3 - periodSeconds: 5 - port: 8080 - path: /health - scheme: HTTP diff --git a/bundles/Eiffel/K8S/cleaner.sh b/bundles/Eiffel/K8S/cleaner.sh index d82cf19..6f2e9a3 100644 --- a/bundles/Eiffel/K8S/cleaner.sh +++ b/bundles/Eiffel/K8S/cleaner.sh @@ -24,7 +24,6 @@ kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_R kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_NEXUS3"-0 kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_GENERATE"-0 kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_PUBLISH"-0 -kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VICI"-0 kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VE"-0 kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_FRONTEND"-0 kubectl delete pod --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS"-0 @@ -43,7 +42,6 @@ kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_NEXUS3_CONFIG" kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_GENERATE" kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_REMREM_PUBLISH" -kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VICI" kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_VE" kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_FRONTEND" kubectl delete statefulset --grace-period=0 --force --namespace "$K8S_NAMESPACE" "$K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS" diff --git a/bundles/Eiffel/K8S/k8s_bundle_functions.bash b/bundles/Eiffel/K8S/k8s_bundle_functions.bash index 358611b..8f29164 100644 --- a/bundles/Eiffel/K8S/k8s_bundle_functions.bash +++ b/bundles/Eiffel/K8S/k8s_bundle_functions.bash @@ -194,24 +194,6 @@ function execute_k8s_command_on_services { local chart="charts/eiffel-2.0.0.tgz" ;; - vici) - local releasename="$K8S_RELEASE_EIFFEL_VICI" - local settings=( - image.registry="$EXTERNAL_DOCKER_REGISTRY" - image.repository="$EIFFEL_VICI_IMAGE_TAG_NAME" - image.tag="$EIFFEL_VICI_VERSION" - ingress.hostName="$K8S_INGRESS_EIFFEL_VICI" - ingress.tls="$K8S_INGRESS_TLS_ENABLE" - ingress.tlsSecret="$K8S_INGRESS_CERT_SECRET_NAME" - ingress.enabled="$K8S_Ingress_Enabled" - fullnameOverride="$K8S_RELEASE_EIFFEL_VICI" - eiffel.servicePort="$EIFFEL_VICI_EXTERNAL_PORT" - eiffel.containerPort="$EIFFEL_VICI_INTERNAL_PORT" - ) - local valuefile="charts/charts_values/eiffel-vici-values.yaml" - local chart="charts/eiffel-2.0.0.tgz" - ;; - remrem_publish) local releasename="$K8S_RELEASE_EIFFEL_REMREM_PUBLISH" local settings=( diff --git a/bundles/Eiffel/K8S/packages/max.sh b/bundles/Eiffel/K8S/packages/max.sh index 938047f..7e9fa7c 100644 --- a/bundles/Eiffel/K8S/packages/max.sh +++ b/bundles/Eiffel/K8S/packages/max.sh @@ -21,4 +21,4 @@ ## ##-------------------------------------------------------------------------------------- -k8s_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend vici dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus" +k8s_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus" diff --git a/bundles/Eiffel/README.md b/bundles/Eiffel/README.md index 5bcf10f..e79bf7e 100644 --- a/bundles/Eiffel/README.md +++ b/bundles/Eiffel/README.md @@ -45,7 +45,6 @@ Components included in Eiffel bundle - Eiffel Jenkins (with Fem Plugin) - Jenkins - Event Repository REST API -- Vici - Dummy Event Repository REST API - Nexus3 diff --git a/bundles/Eiffel/base-config.bash b/bundles/Eiffel/base-config.bash index 5d23f92..2bf32e1 100644 --- a/bundles/Eiffel/base-config.bash +++ b/bundles/Eiffel/base-config.bash @@ -32,7 +32,6 @@ export EIFFEL_JENKINS="eiffel-jenkins" export EIFFEL_NEXUS3="eiffel-nexus3" export EIFFEL_REMREM_GENERATE="eiffel-remrem-generate" export EIFFEL_REMREM_PUBLISH="eiffel-remrem-publish" -export EIFFEL_VICI="eiffel-vici" export EIFFEL_EI_BACKEND_ARTIFACT="eiffel-backend-artifact" export EIFFEL_EI_BACKEND_SOURCECHANGE="eiffel-backend-sourcechange" export EIFFEL_EI_BACKEND_TESTEXECUTION="eiffel-backend-testexecution" @@ -70,9 +69,6 @@ export EIFFEL_REMREM_GENERATE_INTERNAL_PORT=8080 export EIFFEL_REMREM_PUBLISH_EXTERNAL_PORT=8096 export EIFFEL_REMREM_PUBLISH_INTERNAL_PORT=8080 -export EIFFEL_VICI_EXTERNAL_PORT=8092 -export EIFFEL_VICI_INTERNAL_PORT=8080 - export EIFFEL_EI_BACKEND_ARTIFACT_EXTERNAL_PORT=8070 export EIFFEL_EI_BACKEND_ARTIFACT_INTERNAL_PORT=8080 diff --git a/bundles/Eiffel/component-versions.bash b/bundles/Eiffel/component-versions.bash index cc562c5..bbf90db 100644 --- a/bundles/Eiffel/component-versions.bash +++ b/bundles/Eiffel/component-versions.bash @@ -19,7 +19,6 @@ export EIFFEL_MONGODB_VERSION=4.4.1 export EIFFEL_RABBITMQ_VERSION=3.8.9 export EIFFEL_EI_BACKEND_VERSION=3.0.0 export EIFFEL_EI_FRONTEND_VERSION=3.0.0 -export EIFFEL_VICI_VERSION=0.0.1 export EIFFEL_DUMMY_ER_VERSION=latest export EIFFEL_ER_VERSION=2.0.36 export EIFFEL_REMREM_GENERATE_VERSION=2.0.17 @@ -38,7 +37,6 @@ export EIFFEL_MONGODB_IMAGE_TAG_NAME=bitnami/mongodb export EIFFEL_RABBITMQ_IMAGE_TAG_NAME=bitnami/rabbitmq export EIFFEL_EI_BACKEND_IMAGE_TAG_NAME=eiffelericsson/eiffel-intelligence-backend export EIFFEL_EI_FRONTEND_IMAGE_TAG_NAME=eiffelericsson/eiffel-intelligence-frontend -export EIFFEL_VICI_IMAGE_TAG_NAME=eiffelericsson/eiffel-vici export EIFFEL_DUMMY_ER_IMAGE_TAG_NAME=eiffelericsson/dummy-er export EIFFEL_ER_IMAGE_TAG_NAME=eiffelericsson/eiffel-er export EIFFEL_REMREM_GENERATE_IMAGE_TAG_NAME=eiffelericsson/eiffel-remrem-generate @@ -53,7 +51,6 @@ export EIFFEL_MONGODB_IMAGE_TAG=${EIFFEL_MONGODB_IMAGE_TAG_NAME}:${EIFFEL_MONGOD export EIFFEL_RABBITMQ_IMAGE_TAG=${EIFFEL_RABBITMQ_IMAGE_TAG_NAME}:${EIFFEL_RABBITMQ_VERSION} export EIFFEL_EI_BACKEND_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_EI_BACKEND_IMAGE_TAG_NAME}:${EIFFEL_EI_BACKEND_VERSION} export EIFFEL_EI_FRONTEND_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_EI_FRONTEND_IMAGE_TAG_NAME}:${EIFFEL_EI_FRONTEND_VERSION} -export EIFFEL_VICI_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_VICI_IMAGE_TAG_NAME}:${EIFFEL_VICI_VERSION} export EIFFEL_DUMMY_ER_IMAGE_TAG=${EXTERNAL_DOCKER_REGISTRY}/${EIFFEL_DUMMY_ER_IMAGE_TAG_NAME}:${EIFFEL_DUMMY_ER_VERSION} 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} diff --git a/bundles/Eiffel/docker-base-config.bash b/bundles/Eiffel/docker-base-config.bash index 69dd3c1..6f94ca0 100644 --- a/bundles/Eiffel/docker-base-config.bash +++ b/bundles/Eiffel/docker-base-config.bash @@ -25,7 +25,6 @@ export EIFFEL_JENKINS_APPLICATION_PORT=${EIFFEL_JENKINS_INTERNAL_PORT} export EIFFEL_NEXUS_APPLICATION_PORT=${EIFFEL_NEXUS_INTERNAL_PORT} export EIFFEL_REMREM_GENERATE_APPLICATION_PORT=${EIFFEL_REMREM_GENERATE_INTERNAL_PORT} export EIFFEL_REMREM_PUBLISH_APPLICATION_PORT=${EIFFEL_REMREM_PUBLISH_INTERNAL_PORT} -export EIFFEL_VICI_APPLICATION_PORT=${EIFFEL_VICI_INTERNAL_PORT} export EIFFEL_EI_BACKEND_ARTIFACT_APPLICATION_PORT=${EIFFEL_EI_BACKEND_ARTIFACT_INTERNAL_PORT} export EIFFEL_EI_BACKEND_SOURCECHANGE_APPLICATION_PORT=${EIFFEL_EI_BACKEND_SOURCECHANGE_INTERNAL_PORT} export EIFFEL_EI_BACKEND_TESTEXECUTION_APPLICATION_PORT=${EIFFEL_EI_BACKEND_TESTEXECUTION_INTERNAL_PORT} diff --git a/bundles/Eiffel/docker-compose.yml b/bundles/Eiffel/docker-compose.yml index 0ff30cc..5c4c7c3 100644 --- a/bundles/Eiffel/docker-compose.yml +++ b/bundles/Eiffel/docker-compose.yml @@ -228,6 +228,7 @@ services: ####### /Start Eiffel Intelligence Frontend ############################################################################### + ei_frontend: restart: always image: ${EIFFEL_EI_FRONTEND_IMAGE_TAG} @@ -246,21 +247,6 @@ services: ####### /Stop Eiffel Intelligence Frontend ############################################################################### - vici: - restart: always - image: ${EIFFEL_VICI_IMAGE_TAG} - expose: - - "${EIFFEL_VICI_INTERNAL_PORT}" - ports: - - "${EIFFEL_VICI_EXTERNAL_PORT}:${EIFFEL_VICI_INTERNAL_PORT}" -# environment: -# - WAIT_MB_HOSTS=rabbitmq:15672 -# - WAIT_DB_HOSTS=mongodb:27017 - networks: - eiffel.0_1: - aliases: - - ${EIFFEL_VICI} - dummy_er: restart: always image: ${EIFFEL_DUMMY_ER_IMAGE_TAG} @@ -270,7 +256,6 @@ services: - "${EIFFEL_DUMMY_ER_EXTERNAL_PORT}:${EIFFEL_DUMMY_ER_INTERNAL_PORT}" depends_on: - er - - vici networks: eiffel.0_1: aliases: diff --git a/bundles/Eiffel/docker-compose/packages/max.sh b/bundles/Eiffel/docker-compose/packages/max.sh index de8ed95..6523e50 100644 --- a/bundles/Eiffel/docker-compose/packages/max.sh +++ b/bundles/Eiffel/docker-compose/packages/max.sh @@ -21,4 +21,4 @@ ## ##-------------------------------------------------------------------------------------- -docker_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend vici dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus" +docker_package_services="mongodb mongo_seed rabbitmq ei_backend_artifact ei_backend_sourcechange ei_backend_testexecution ei_backend_allevents ei_frontend dummy_er remrem_generate remrem_publish er jenkins jenkins_fem nexus" diff --git a/bundles/Eiffel/k8s-base-config.bash b/bundles/Eiffel/k8s-base-config.bash index fe1a1d0..82d3ec4 100644 --- a/bundles/Eiffel/k8s-base-config.bash +++ b/bundles/Eiffel/k8s-base-config.bash @@ -47,7 +47,6 @@ export K8S_RELEASE_EIFFEL_EI_BACKEND_SOURCECHANGE=$EIFFEL_EI_BACKEND_SOURCECHANG export K8S_RELEASE_EIFFEL_EI_BACKEND_TESTEXECUTION=$EIFFEL_EI_BACKEND_TESTEXECUTION-${K8S_NAMESPACE} export K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS=$EIFFEL_EI_BACKEND_ALLEVENTS-${K8S_NAMESPACE} export K8S_RELEASE_EIFFEL_DUMMY_ER=$EIFFEL_DUMMY_ER-${K8S_NAMESPACE} -export K8S_RELEASE_EIFFEL_VICI=$EIFFEL_VICI-${K8S_NAMESPACE} export K8S_RELEASE_EIFFEL_REMREM_GENERATE=$EIFFEL_REMREM_GENERATE-${K8S_NAMESPACE} export K8S_RELEASE_EIFFEL_REMREM_PUBLISH=$EIFFEL_REMREM_PUBLISH-${K8S_NAMESPACE} export K8S_RELEASE_EIFFEL_ER=$EIFFEL_ER-${K8S_NAMESPACE} @@ -66,7 +65,6 @@ export K8S_INGRESS_EIFFEL_JENKINS=$K8S_RELEASE_EIFFEL_JENKINS.$K8S_DOMAINNAME export K8S_INGRESS_EIFFEL_NEXUS3=$K8S_RELEASE_EIFFEL_NEXUS3.$K8S_DOMAINNAME export K8S_INGRESS_EIFFEL_REMREM_GENERATE=$K8S_RELEASE_EIFFEL_REMREM_GENERATE.$K8S_DOMAINNAME export K8S_INGRESS_EIFFEL_REMREM_PUBLISH=$K8S_RELEASE_EIFFEL_REMREM_PUBLISH.$K8S_DOMAINNAME -export K8S_INGRESS_EIFFEL_VICI=$K8S_RELEASE_EIFFEL_VICI.$K8S_DOMAINNAME export K8S_INGRESS_EIFFEL_EI_BACKEND_ALLEVENTS=$K8S_RELEASE_EIFFEL_EI_BACKEND_ALLEVENTS.$K8S_DOMAINNAME export K8S_INGRESS_EIFFEL_EI_BACKEND_ARTIFACT=$K8S_RELEASE_EIFFEL_EI_BACKEND_ARTIFACT.$K8S_DOMAINNAME export K8S_INGRESS_EIFFEL_EI_BACKEND_SOURCECHANGE=$K8S_RELEASE_EIFFEL_EI_BACKEND_SOURCECHANGE.$K8S_DOMAINNAME @@ -85,7 +83,6 @@ export EIFFEL_JENKINS=$K8S_RELEASE_EIFFEL_JENKINS export EIFFEL_NEXUS3=$K8S_RELEASE_EIFFEL_NEXUS3 export EIFFEL_REMREM_GENERATE=$K8S_RELEASE_EIFFEL_REMREM_GENERATE export EIFFEL_REMREM_PUBLISH=$K8S_RELEASE_EIFFEL_REMREM_PUBLISH -export EIFFEL_VICI=$K8S_RELEASE_EIFFEL_VICI export EIFFEL_EI_BACKEND_ARTIFACT=$K8S_RELEASE_EIFFEL_EI_BACKEND_ARTIFACT export EIFFEL_EI_BACKEND_SOURCECHANGE=$K8S_RELEASE_EIFFEL_EI_BACKEND_SOURCECHANGE export EIFFEL_EI_BACKEND_TESTEXECUTION=$K8S_RELEASE_EIFFEL_EI_BACKEND_TESTEXECUTION @@ -104,13 +101,9 @@ export EIFFEL_JENKINS_APPLICATION_PORT=${EIFFEL_JENKINS_EXTERNAL_PORT} export EIFFEL_NEXUS_APPLICATION_PORT=${EIFFEL_NEXUS_EXTERNAL_PORT} export EIFFEL_REMREM_GENERATE_APPLICATION_PORT=${EIFFEL_REMREM_GENERATE_EXTERNAL_PORT} export EIFFEL_REMREM_PUBLISH_APPLICATION_PORT=${EIFFEL_REMREM_PUBLISH_EXTERNAL_PORT} -export EIFFEL_VICI_APPLICATION_PORT=${EIFFEL_VICI_EXTERNAL_PORT} export EIFFEL_EI_BACKEND_ARTIFACT_APPLICATION_PORT=${EIFFEL_EI_BACKEND_ARTIFACT_EXTERNAL_PORT} export EIFFEL_EI_BACKEND_SOURCECHANGE_APPLICATION_PORT=${EIFFEL_EI_BACKEND_SOURCECHANGE_EXTERNAL_PORT} export EIFFEL_EI_BACKEND_TESTEXECUTION_APPLICATION_PORT=${EIFFEL_EI_BACKEND_TESTEXECUTION_EXTERNAL_PORT} export EIFFEL_EI_BACKEND_ALLEVENTS_APPLICATION_PORT=${EIFFEL_EI_BACKEND_ALLEVENTS_EXTERNAL_PORT} export EIFFEL_EI_FRONTEND_APPLICATION_PORT=${EIFFEL_EI_FRONTEND_EXTERNAL_PORT} export EIFFEL_EI_FRONTEND_EXTERNAL_APPLICATION_PORT=443 - - - diff --git a/bundles/GitLab/README.md b/bundles/GitLab/README.md index 60e767c..db43be8 100644 --- a/bundles/GitLab/README.md +++ b/bundles/GitLab/README.md @@ -58,7 +58,6 @@ Dependent Components Included from Eiffel2 Bundle - RemRem Publish - Nexus3 - Event Repository REST API -- Eiffel-Vici - Eiffel Intelligence artifact Usage diff --git a/bundles/GitLab/config-bundle.bash b/bundles/GitLab/config-bundle.bash index b7ea9b5..ce2c176 100644 --- a/bundles/GitLab/config-bundle.bash +++ b/bundles/GitLab/config-bundle.bash @@ -43,7 +43,7 @@ export GITLAB_GITLAB="gitlab-gitlab" # - OBS no spaces allowed!! # -CONF_GitLab_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,vici,dummy_er,nexus" +CONF_GitLab_DEPENDENCIES_BUNDLES[0]="Eiffel,rabbitmq,mongodb,mongo_seed,remrem_generate,remrem_publish,er,dummy_er,nexus" # ------------------------------ diff --git a/wiki/cx/components.md b/wiki/cx/components.md index fb5de7c..50cb0f8 100644 --- a/wiki/cx/components.md +++ b/wiki/cx/components.md @@ -35,5 +35,3 @@ MongoDB & Data Seeding | mongodb
mongo_seed | N/A | N/A | The seed-data fold RemRem Generate | remrem_generate | N/A | eiffel-remrem-generate-\.\ RemRem Publish | remrem_publish | N/A | eiffel-remrem-publish-\.\ Event Repository REST API | er | N/A | eiffel-er-\.\ -Eiffel Vici | vici | N/A | eiffel-vici-\.\ - diff --git a/wiki/cx/setup.md b/wiki/cx/setup.md index 47c29aa..fe8b492 100644 --- a/wiki/cx/setup.md +++ b/wiki/cx/setup.md @@ -129,7 +129,6 @@ Dependent Components Included from Eiffel Bundle - RemRem Generate - RemRem Publish - Event Repository REST API -- Eiffel ViCi - Eiffel Intelligence (with artifact rules) A more detailed [view of the components can be found here](components.md). diff --git a/wiki/cx/tutorial.md b/wiki/cx/tutorial.md index 733c83e..5d8df49 100644 --- a/wiki/cx/tutorial.md +++ b/wiki/cx/tutorial.md @@ -98,7 +98,6 @@ Check your pushed patchset - Click ms-frontend to see post-merge pipeline execution ### 3. Eiffel Events Generated in Jenkins Pipelines -- Eiffel Vici: eiffel-vici-\.\ - Instruction TBD XXXXX @@ -222,7 +221,6 @@ Check your pushed patchset - Click on workflows icon on the left manu ### 2. Eiffel Events Generated in Jenkins Pipelines -- Eiffel Vici: eiffel-vici-\.\ - Instruction TBD XXXXX diff --git a/wiki/eiffel/components.md b/wiki/eiffel/components.md index 15575df..4fd6101 100644 --- a/wiki/eiffel/components.md +++ b/wiki/eiffel/components.md @@ -18,7 +18,7 @@ Component | Service name | User/PSW | Info ------------- | ------------ | -------- | ---- -Dummy Event Repository REST API | dummy_er | N/A | Needed for Vici for now +Dummy Event Repository REST API | dummy_er | N/A | Needed for Vici (**deprecated**) Eiffel Intelligence (Frontend) | ei_frontend | N/A Eiffel Intelligence (All Events) | ei_allevents | N/A Eiffel Intelligence (Artifact) | ei_artifact | N/A | Subscription included (seeded) to trigger predefined Jenkins Job ei-artifact-triggered-job via native Jenkins Rest API @@ -32,7 +32,6 @@ MongoDb & Data Seeding | mongodb & mongo_seed | N/A | The seed-data folder in Ea Nexus3 | nexus | admin / admin123 | RemRem Generate | remrem_generate | N/A | RemRem Publish | remrem_publish | N/A | -Vici | eiffel_vici | N/A ## Layout This is a schematic picture of the environment: diff --git a/wiki/gitlab/components.md b/wiki/gitlab/components.md index 9c60a68..4595257 100644 --- a/wiki/gitlab/components.md +++ b/wiki/gitlab/components.md @@ -26,7 +26,6 @@ RemRem Generate | remrem_generate | N/A | eiffel-remrem-generate-\.\ RemRem Publish | remrem_publish | N/A | eiffel-remrem-publish-\.\ Nexus3 | nexus | admin/admin123 | eiffel-nexus3-\.\ Event Repository REST API | er | N/A | eiffel-er-\.\ -Eiffel ViCi | vici | N/A | eiffel-vici-\.\ ## Layout This is a schematic picture of the environment: