From 6f6ccfb0cc99fb8dd7277be7c61ca8d3fa692a37 Mon Sep 17 00:00:00 2001
From: Tancho Mihov <tancho.mihov@cleverpine.com>
Date: Tue, 31 May 2022 11:22:17 +0300
Subject: [PATCH 1/5] update .gitlab-ci.yml
---
.gitlab-ci.yml | 30 ++++++++++++++++++++++++++++++
1 file changed, 30 insertions(+)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index acbc2bf..d4c1767 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,5 +1,12 @@
+variables:
+ APP_HELM_NAME: cache
+ DOCKER_FILE: deployment/ci/Dockerfile
+ GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/gaiax/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+
stages:
- test
+ - build
+ - manifest
before_script:
- ln -s /builds /go/src/code.vereign.com
@@ -23,3 +30,26 @@ unit tests:
- go version
- go test -race ./... -coverprofile=coverage.out
- go tool cover -func=coverage.out
+
+include:
+ - project: 'Seal/ci-helpers'
+ file: 'docker-build.yml'
+ - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
+
+amd64:
+ extends: .docker-build
+ stage: build
+ tags:
+ - amd64-docker
+
+manifest:
+ extends: .manifest-amd64
+ stage: manifest
+
+manifest-release:
+ extends: .manifest-release
+ stage: manifest
+
+manifest-cloud:
+ extends: .manifest-cloud
+ stage: manifest
--
GitLab
From 8597054640530b3b68d8d7daab2d4f71d48f4b73 Mon Sep 17 00:00:00 2001
From: Tancho Mihov <tancho.mihov@cleverpine.com>
Date: Tue, 31 May 2022 12:37:14 +0300
Subject: [PATCH 2/5] update .gitlab-ci.yml
---
.gitlab-ci.yml | 41 ++++++++++++++++++++----------------
.gitlab-ci1.yml | 31 ++++++++++++++++++++++++++++
.gitlab-ci2.yml | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 109 insertions(+), 18 deletions(-)
create mode 100644 .gitlab-ci1.yml
create mode 100644 .gitlab-ci2.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index d4c1767..e0c15a3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,16 +1,19 @@
variables:
APP_HELM_NAME: cache
DOCKER_FILE: deployment/ci/Dockerfile
- GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/gaiax/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+ GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/backend/rse/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
stages:
+ - compile
- test
- build
- manifest
+ - deploy
-before_script:
- - ln -s /builds /go/src/code.vereign.com
- - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
+include:
+ - project: 'Seal/ci-helpers'
+ file: 'docker-build.yml'
+ - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
lint:
image: golangci/golangci-lint:v1.44.2
@@ -20,21 +23,23 @@ lint:
script:
- golangci-lint --version
- golangci-lint run
+ before_script:
+ - ln -s /builds /go/src/code.vereign.com
+ - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
unit tests:
image: golang:1.17.7
+ extends: .gotest
stage: test
tags:
- amd64-docker
- script:
- - go version
- - go test -race ./... -coverprofile=coverage.out
- - go tool cover -func=coverage.out
+ before_script: []
-include:
- - project: 'Seal/ci-helpers'
- file: 'docker-build.yml'
- - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
+ppc64le:
+ extends: .docker-build
+ stage: build
+ tags:
+ - ppc64le-docker
amd64:
extends: .docker-build
@@ -42,14 +47,14 @@ amd64:
tags:
- amd64-docker
-manifest:
- extends: .manifest-amd64
+local:
+ extends: .manifest
stage: manifest
-manifest-release:
- extends: .manifest-release
+cloud:
+ extends: .manifest-cloud
stage: manifest
-manifest-cloud:
- extends: .manifest-cloud
+nexus:
+ extends: .manifest-release
stage: manifest
diff --git a/.gitlab-ci1.yml b/.gitlab-ci1.yml
new file mode 100644
index 0000000..add8464
--- /dev/null
+++ b/.gitlab-ci1.yml
@@ -0,0 +1,31 @@
+variables:
+ APP_HELM_NAME: proof-manager
+ DOCKER_FILE: deployment/ci/Dockerfile
+ GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/gaiax/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+
+stages:
+ - build
+ - manifest
+
+include:
+ - project: 'Seal/ci-helpers'
+ file: 'docker-build.yml'
+ - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
+
+amd64:
+ extends: .docker-build
+ stage: build
+ tags:
+ - amd64-docker
+
+manifest:
+ extends: .manifest-amd64
+ stage: manifest
+
+manifest-release:
+ extends: .manifest-release
+ stage: manifest
+
+manifest-cloud:
+ extends: .manifest-cloud
+ stage: manifest
diff --git a/.gitlab-ci2.yml b/.gitlab-ci2.yml
new file mode 100644
index 0000000..d4c1767
--- /dev/null
+++ b/.gitlab-ci2.yml
@@ -0,0 +1,55 @@
+variables:
+ APP_HELM_NAME: cache
+ DOCKER_FILE: deployment/ci/Dockerfile
+ GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/gaiax/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+
+stages:
+ - test
+ - build
+ - manifest
+
+before_script:
+ - ln -s /builds /go/src/code.vereign.com
+ - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
+
+lint:
+ image: golangci/golangci-lint:v1.44.2
+ stage: test
+ tags:
+ - amd64-docker
+ script:
+ - golangci-lint --version
+ - golangci-lint run
+
+unit tests:
+ image: golang:1.17.7
+ stage: test
+ tags:
+ - amd64-docker
+ script:
+ - go version
+ - go test -race ./... -coverprofile=coverage.out
+ - go tool cover -func=coverage.out
+
+include:
+ - project: 'Seal/ci-helpers'
+ file: 'docker-build.yml'
+ - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
+
+amd64:
+ extends: .docker-build
+ stage: build
+ tags:
+ - amd64-docker
+
+manifest:
+ extends: .manifest-amd64
+ stage: manifest
+
+manifest-release:
+ extends: .manifest-release
+ stage: manifest
+
+manifest-cloud:
+ extends: .manifest-cloud
+ stage: manifest
--
GitLab
From 1008eee1b927a2e7ae4592a42a5ccb94be181f61 Mon Sep 17 00:00:00 2001
From: Tancho Mihov <tancho.mihov@cleverpine.com>
Date: Tue, 31 May 2022 12:40:41 +0300
Subject: [PATCH 3/5] update .gitlab-ci.yml
---
.gitlab-ci.yml | 12 +++---------
1 file changed, 3 insertions(+), 9 deletions(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index e0c15a3..8ba7e75 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -35,26 +35,20 @@ unit tests:
- amd64-docker
before_script: []
-ppc64le:
- extends: .docker-build
- stage: build
- tags:
- - ppc64le-docker
-
amd64:
extends: .docker-build
stage: build
tags:
- amd64-docker
-local:
- extends: .manifest
+manifest:
+ extends: .manifest-amd64
stage: manifest
cloud:
extends: .manifest-cloud
stage: manifest
-nexus:
+release:
extends: .manifest-release
stage: manifest
--
GitLab
From 18dff31a47b75f7aad928e1297149972d850d3c0 Mon Sep 17 00:00:00 2001
From: Tancho Mihov <tancho.mihov@cleverpine.com>
Date: Tue, 14 Jun 2022 10:58:18 +0300
Subject: [PATCH 4/5] update helpers in .gitlab-ci.yml
---
.gitlab-ci.yml | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 8ba7e75..81e8f42 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -11,7 +11,7 @@ stages:
- deploy
include:
- - project: 'Seal/ci-helpers'
+ - project: 'gaiax/tsa/ci-helpers'
file: 'docker-build.yml'
- template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
--
GitLab
From 017daafb3f30e10040ba9b3f344ad1422ba4db50 Mon Sep 17 00:00:00 2001
From: Tancho Mihov <tancho.mihov@cleverpine.com>
Date: Tue, 14 Jun 2022 13:24:01 +0300
Subject: [PATCH 5/5] update image path
---
.gitlab-ci.yml | 2 +-
.gitlab-ci1.yml | 31 ----------------------------
.gitlab-ci2.yml | 55 -------------------------------------------------
3 files changed, 1 insertion(+), 87 deletions(-)
delete mode 100644 .gitlab-ci1.yml
delete mode 100644 .gitlab-ci2.yml
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 81e8f42..b19518b 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,7 +1,7 @@
variables:
APP_HELM_NAME: cache
DOCKER_FILE: deployment/ci/Dockerfile
- GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/backend/rse/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
+ GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/gaiax/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
stages:
- compile
diff --git a/.gitlab-ci1.yml b/.gitlab-ci1.yml
deleted file mode 100644
index add8464..0000000
--- a/.gitlab-ci1.yml
+++ /dev/null
@@ -1,31 +0,0 @@
-variables:
- APP_HELM_NAME: proof-manager
- DOCKER_FILE: deployment/ci/Dockerfile
- GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/gaiax/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-
-stages:
- - build
- - manifest
-
-include:
- - project: 'Seal/ci-helpers'
- file: 'docker-build.yml'
- - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
-
-amd64:
- extends: .docker-build
- stage: build
- tags:
- - amd64-docker
-
-manifest:
- extends: .manifest-amd64
- stage: manifest
-
-manifest-release:
- extends: .manifest-release
- stage: manifest
-
-manifest-cloud:
- extends: .manifest-cloud
- stage: manifest
diff --git a/.gitlab-ci2.yml b/.gitlab-ci2.yml
deleted file mode 100644
index d4c1767..0000000
--- a/.gitlab-ci2.yml
+++ /dev/null
@@ -1,55 +0,0 @@
-variables:
- APP_HELM_NAME: cache
- DOCKER_FILE: deployment/ci/Dockerfile
- GOOGLE_IMAGE: ${GOOGLE_LIGHT_REGISTRY_URL}/gaiax/$CI_PROJECT_NAME:$CI_COMMIT_REF_NAME
-
-stages:
- - test
- - build
- - manifest
-
-before_script:
- - ln -s /builds /go/src/code.vereign.com
- - cd /go/src/code.vereign.com/${CI_PROJECT_PATH}
-
-lint:
- image: golangci/golangci-lint:v1.44.2
- stage: test
- tags:
- - amd64-docker
- script:
- - golangci-lint --version
- - golangci-lint run
-
-unit tests:
- image: golang:1.17.7
- stage: test
- tags:
- - amd64-docker
- script:
- - go version
- - go test -race ./... -coverprofile=coverage.out
- - go tool cover -func=coverage.out
-
-include:
- - project: 'Seal/ci-helpers'
- file: 'docker-build.yml'
- - template: 'Workflows/Branch-Pipelines.gitlab-ci.yml'
-
-amd64:
- extends: .docker-build
- stage: build
- tags:
- - amd64-docker
-
-manifest:
- extends: .manifest-amd64
- stage: manifest
-
-manifest-release:
- extends: .manifest-release
- stage: manifest
-
-manifest-cloud:
- extends: .manifest-cloud
- stage: manifest
--
GitLab