Update ci

.gitlab-ci.yml

@@ -5,79 +5,10 @@ stages:
   - test
   - publish
 
-test:
-  stage: test
-  image: gradle:6.3-jdk8
-  tags:
-    - mbr
-  script:
-    - gradle --no-daemon --no-scan --no-build-cache test --fail-fast
-
-
-.build-image:
-  stage: publish
-  image: docker:stable
-  services:
-    - docker:dind
-  script:
-    - docker login -u "$REGISTRY_USER" -p "$REGISTRY_PASSWORD" "$REGISTRY"
-    - docker build --pull -t "$IMAGE_TAG" -f "$DOCKERFILE" .
-    - docker push "$IMAGE_TAG"
-    - docker logout
-
-build-tagged-image:
-  extends: .build-image
-  variables:
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_TAG"
-    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
-    REGISTRY_USER: "$CI_REGISTRY_USER"
-    REGISTRY: "$CI_REGISTRY"
-    DOCKERFILE: "Dockerfile"
-  only:
-    - tags
-
-build-latest-image:
-  extends: .build-image
-  variables:
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:latest"
-    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
-    REGISTRY_USER: "$CI_REGISTRY_USER"
-    REGISTRY: "$CI_REGISTRY"
-    DOCKERFILE: "Dockerfile"
-  only:
-    - master
-
-build-feature-branch-image:
-  extends: .build-image
-  variables:
-    IMAGE_TAG: "$CI_REGISTRY_IMAGE:$CI_COMMIT_REF_NAME"
-    REGISTRY_PASSWORD: "$CI_REGISTRY_PASSWORD"
-    REGISTRY_USER: "$CI_REGISTRY_USER"
-    REGISTRY: "$CI_REGISTRY"
-    DOCKERFILE: "Dockerfile"
-  except:
-    - master
-    - tags
-
-test-chart:
-  stage: test
-  image: dtzar/helm-kubectl:3.2.0
-  tags:
-    - mbr
-  script:
-    - helm lint helm-charts/
-
-publish-chart:
-  stage: publish
-  image: dtzar/helm-kubectl:3.2.0
-  tags:
-    - mbr
-  script:
-    - export HELM_EXPERIMENTAL_OCI=1
-    - helm registry login -u "$CI_REGISTRY_USER" -p "$CI_REGISTRY_PASSWORD" "$CI_REGISTRY"
-    - ./insert_chart_versions.sh
-    - helm chart save helm-charts/ "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
-    - helm chart push "$CI_REGISTRY/$CI_PROJECT_PATH:$CI_COMMIT_TAG-chart"
-    - helm registry logout "$CI_REGISTRY"
-  only:
-    - tags
\ No newline at end of file
+include:
+  - project: 'memoriav/memobase-2020/utilities/ci-templates'
+    file: 'gradle-test/gradle-test.yml'
+  - project: 'memoriav/memobase-2020/utilities/ci-templates'
+    file: 'docker-image/docker-image.yml'
+  - project: 'memoriav/memobase-2020/utilities/ci-templates'
+    file: 'helm-chart/helm-chart.yml'

build.gradle

@@ -41,7 +41,7 @@ dependencies {
     implementation group: 'org.apache.kafka', name: 'kafka-clients', version: kafkaV
     implementation "org.apache.kafka:kafka-streams:${kafkaV}"
 
-    implementation 'org.memobase:memobase-service-utilities:1.12.1'
+    implementation 'org.memobase:memobase-service-utilities:1.12.2'
     implementation 'ch.memobase:import-process-effects-registry_2.12:0.2.1'
     // CSV Reader
     implementation("com.github.doyaaaaaken:kotlin-csv-jvm:0.7.3")

helm-charts/values.yaml

@@ -7,30 +7,12 @@ registry: "cr.gitlab.switch.ch"
 image: "memoriav/memobase-2020/services/import-process/table-data-transform"
 tag: "latest"
 
+deploymentName: table-data-transform
+applicationId: table-data-transform-app
+
 kafkaConfigs: prod-kafka-bootstrap-servers
 sftpConfigs: internal-sftp-config
 
-lastJobName: text-file-validation
-
-
-############################################
-## Values below should be defined via the  #
-## User Interface (Drupal)                 #
-############################################
-
-jobName: table-data-transform
-processId: p0001
-
-institutionId: placeholder
-recordSetId: placeholder
-
-# DEFAULT APP CONFIG VALUES
-# all index values begin at ONE and not at ZERO!
-# sheetIndex is the index of the sheet inside of an .xslx, .xsl or .ods file. Ignored for .csv, .tsv.
-sheetIndex: "1"
-# headerCount is the number of lines to skip before creating records
-headerCount: "1"
-# headerLineIndex is the index of the header row to use for property names.
-headerLineIndex: "1"
-# identifierIndex is the index of the column used as an unique identifier for each row.
-identifierIndex: "1"
\ No newline at end of file
+inputTopicName: import-process-data-transform
+outputTopicName: import-process-mapper
+reportingTopicName: import-process-reporting
\ No newline at end of file