From 99f36a5dda1650346913f36fecd49a8dc520b398 Mon Sep 17 00:00:00 2001
From: Kalin Daskalov <kalin.daskalov@vereign.com>
Date: Thu, 2 Nov 2023 09:03:05 +0200
Subject: [PATCH 1/5] changes to ci and add app source as submodule
---
.gitlab-ci.yml | 97 +++++++++++++++++++++++++++++++++++++++++++++++---
.gitmodules | 3 ++
app | 1 +
3 files changed, 96 insertions(+), 5 deletions(-)
create mode 100644 .gitmodules
create mode 160000 app
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a15d084..88052a4 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,21 +1,108 @@
-image: $HELM_IMAGE
-
-include:
- - project: 'gaiax/tsa/ci-helpers'
- file: 'helm-package.yml'
+---
+variables:
+ HELPERS_FILE: build-eclipse.yml
+ HELM_HELPERS_FILE: helm-eclipse.yml
+ APP_HELM_NAME: infohub
+ DOCKER_FILE: app/deployment/ci/Dockerfile
stages:
+ - test
+ - build
+ - manifest
- lint
- package
+ - deploy
+
+include:
+ - project: "${HELPERS_PATH}"
+ file: 'build-eclipse.yml'
+ - template: "Workflows/Branch-Pipelines.gitlab-ci.yml"
+ - project: "${HELPERS_PATH}"
+ file: 'helm-eclipse.yml'
+
+
+lint:
+ image: golangci/golangci-lint:latest
+ stage: test
+ tags:
+ - amd64-docker
+ script:
+ - golangci-lint --version
+ - golangci-lint run
+ before_script:
+ - ln -s /builds /go/src/gitlab.com
+ - cd /go/src/gitlab.com/${CI_PROJECT_PATH}/app
+
+unit tests:
+ image: golang:1.21.1
+ stage: test
+ tags:
+ - amd64-docker
+ script:
+ - go version
+ - go test $(go list ./... | grep -v /integration) -race -coverprofile=coverage.out
+ - go tool cover -func=coverage.out
+ before_script:
+ - ln -s /builds /go/src/gitlab.com
+ - cd /go/src/gitlab.com/${CI_PROJECT_PATH}/app
+ coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
+
+govulncheck:
+ image: golang:1.21.1
+ stage: test
+ tags:
+ - amd64-docker
+ before_script:
+ - ln -s /builds /go/src/gitlab.com
+ - cd /go/src/gitlab.com/${CI_PROJECT_PATH}/app
+ script:
+ - go version
+ - go install golang.org/x/vuln/cmd/govulncheck@latest
+ - govulncheck ./...
+
+amd64:
+ extends: .docker-build
+ stage: build
+ tags:
+ - amd64-docker
+
+dockerize sync:
+ stage: build
+ tags:
+ - amd64-docker
+ script:
+ - cd ./app/cmd/sync
+ - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
+ - docker build -t "${CI_REGISTRY_IMAGE}/sync:${CI_COMMIT_REF_NAME}" .
+ - docker push "${CI_REGISTRY_IMAGE}/sync:${CI_COMMIT_REF_NAME}"
+ only:
+ - main
+ - tags
+ - integration
+
+manifest:
+ extends: .manifest-amd64
+ stage: manifest
+
+cloud:
+ extends: .manifest-cloud
+ stage: manifest
+
+release:
+ extends: .manifest-release
+ stage: manifest
helm-lint:
+ image: ${HELM_IMAGE}
extends: .helm-lint
stage: lint
tags:
- amd64-docker
helm-package:
+ image: ${HELM_IMAGE}
extends: .helm-package
stage: package
tags:
- amd64-docker
+ needs: ["helm-lint"]
diff --git a/.gitmodules b/.gitmodules
new file mode 100644
index 0000000..0c77863
--- /dev/null
+++ b/.gitmodules
@@ -0,0 +1,3 @@
+[submodule "app"]
+ path = app
+ url = https://gitlab.eclipse.org/eclipse/xfsc/tsa/infohub.git
diff --git a/app b/app
new file mode 160000
index 0000000..d4caff8
--- /dev/null
+++ b/app
@@ -0,0 +1 @@
+Subproject commit d4caff859968d1499817805715b81e6bde583ffb
--
GitLab
From db9e1ef2572e466bcaabe005c41d084ba5c8126b Mon Sep 17 00:00:00 2001
From: Kalin Daskalov <kalin.daskalov@vereign.com>
Date: Thu, 2 Nov 2023 09:18:52 +0200
Subject: [PATCH 2/5] changes to test jobs
---
.gitlab-ci.yml | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 88052a4..2adfb63 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -34,7 +34,7 @@ lint:
- cd /go/src/gitlab.com/${CI_PROJECT_PATH}/app
unit tests:
- image: golang:1.21.1
+ image: golang:1.21.3
stage: test
tags:
- amd64-docker
@@ -48,7 +48,7 @@ unit tests:
coverage: '/total:\s+\(statements\)\s+(\d+.\d+\%)/'
govulncheck:
- image: golang:1.21.1
+ image: golang:1.21.3
stage: test
tags:
- amd64-docker
--
GitLab
From 0c078727e2905b7fad380323e1d2fc8361860648 Mon Sep 17 00:00:00 2001
From: Kalin Daskalov <kalin.daskalov@vereign.com>
Date: Thu, 2 Nov 2023 09:25:45 +0200
Subject: [PATCH 3/5] remove sync job
---
.gitlab-ci.yml | 14 --------------
1 file changed, 14 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 2adfb63..ab2a015 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -66,20 +66,6 @@ amd64:
tags:
- amd64-docker
-dockerize sync:
- stage: build
- tags:
- - amd64-docker
- script:
- - cd ./app/cmd/sync
- - docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- - docker build -t "${CI_REGISTRY_IMAGE}/sync:${CI_COMMIT_REF_NAME}" .
- - docker push "${CI_REGISTRY_IMAGE}/sync:${CI_COMMIT_REF_NAME}"
- only:
- - main
- - tags
- - integration
-
manifest:
extends: .manifest-amd64
stage: manifest
--
GitLab
From 75a0ec5eebd488a90a1b4c79d01c28f1dbf51f9e Mon Sep 17 00:00:00 2001
From: Kalin Daskalov <kalin.daskalov@vereign.com>
Date: Thu, 2 Nov 2023 11:51:31 +0200
Subject: [PATCH 4/5] add branch to .gitmodules
---
.gitmodules | 1 +
1 file changed, 1 insertion(+)
diff --git a/.gitmodules b/.gitmodules
index 0c77863..a6a50a8 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,3 +1,4 @@
[submodule "app"]
path = app
url = https://gitlab.eclipse.org/eclipse/xfsc/tsa/infohub.git
+ branch = main
--
GitLab
From 754e0541a830aab265b9b951f118137d01be4079 Mon Sep 17 00:00:00 2001
From: Kalin Daskalov <kalin.daskalov@vereign.com>
Date: Mon, 6 Nov 2023 14:10:23 +0200
Subject: [PATCH 5/5] update submodule and new task
---
Chart.yaml | 4 ++--
app | 2 +-
values.yaml | 2 +-
3 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/Chart.yaml b/Chart.yaml
index fc3e7cf..d37b825 100644
--- a/Chart.yaml
+++ b/Chart.yaml
@@ -1,6 +1,6 @@
apiVersion: v1
-appVersion: v1.2.1
+appVersion: v1.2.2
description: infohub deployment
name: infohub
-version: 1.2.1
+version: 1.2.2
icon: "https://www.vereign.com/wp-content/themes/vereign2020/images/vereign-logo.svg"
diff --git a/app b/app
index d4caff8..8f92322 160000
--- a/app
+++ b/app
@@ -1 +1 @@
-Subproject commit d4caff859968d1499817805715b81e6bde583ffb
+Subproject commit 8f923225d4c63bb8f0a415b6ba8b260935ae2d40
diff --git a/values.yaml b/values.yaml
index 5aae78f..9adc7d7 100644
--- a/values.yaml
+++ b/values.yaml
@@ -8,7 +8,7 @@ nameOverride: ""
image:
repository: eu.gcr.io/vrgn-infra-prj
# -- Image name
- name: gaiax/infohub
+ name: tsa/infohub
# -- Image tag
# Uses .Chart.AppVersion if empty
tag: ""
--
GitLab