diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index a0ecab3cfee19b7ad230f407de6a6c51632fe4be..4694ad9d910ea5a7e86092c23cef36ab8b865a8c 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -1,6 +1,6 @@
variables:
SECURE_ANALYZERS_PREFIX: registry.gitlab.com/gitlab-org/security-products/analyzers
- DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
+ DOCKER_IMAGE_SHA: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}
stages:
- .pre
diff --git a/build/ci/.build-container.yml b/build/ci/.build-container.yml
index c02be9f278caca20c7686aa0b345f90e39daf6ac..12dfb819df09e377633a89e1c7db23484925b2a0 100644
--- a/build/ci/.build-container.yml
+++ b/build/ci/.build-container.yml
@@ -1,7 +1,5 @@
-
variables:
DOCKER_TLS_CERTDIR: "/certs"
- DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
.build: &build
before_script:
@@ -10,7 +8,6 @@ variables:
services:
- name: docker:19.03.12-dind
command: ["--registry-mirror", "http://141.100.70.170:6000", "--dns", "1.1.1.1"]
-
stage: build
tags:
- dind
@@ -25,6 +22,7 @@ variables:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $DOCKER_IMAGE_SHA
- docker tag $DOCKER_IMAGE_SHA $TAG
+ - docker tag $DOCKER_IMAGE_SHA registry.code.fbi.h-da.de/cocsn/gosdn:${CI_PIPELINE_ID}
- docker push $TAG
build:develop:
diff --git a/build/ci/.terraform-ci.yml b/build/ci/.terraform-ci.yml
index 0177f1cabd1f99e674e21ab6b346ca1921172be8..db7d7e3f1f3da43d123dd52360923cb574a911d8 100644
--- a/build/ci/.terraform-ci.yml
+++ b/build/ci/.terraform-ci.yml
@@ -2,6 +2,7 @@
variables:
TF_ROOT: ${CI_PROJECT_DIR}/test/terraform
TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/${CI_PIPELINE_ID}
+ DOCKER_IMAGE_SHA: ${CI_REGISTRY_IMAGE}:${CI_COMMIT_SHA}
cache:
key: ${CI_PIPELINE_ID}
@@ -19,6 +20,8 @@ cache:
- export TF_VAR_integration_username=terraform
- export TF_VAR_integration_access_token=${TERRAFORM_API_TOKEN}
- export TF_VAR_integration_registry=${CI_REGISTRY}
+ - export TF_VAR_ceos_tag=registry.code.fbi.h-da.de/cocsn/gosdn/ceos:${CI_PIPELINE_ID}
+ - export TF_VAR_container_tag=registry.code.fbi.h-da.de/cocsn/gosdn:${CI_PIPELINE_ID}
- export TF_VAR_tls_key=${DOCKER_TLS_KEY}
- export TF_VAR_tls_cert=${DOCKER_TLS_CERT}
- export TF_VAR_tls_ca_cert=${DOCKER_TLS_CA}
@@ -26,8 +29,6 @@ cache:
- export TF_VAR_gosdn_address=172.24.$(cat secondOctet).$(cat firstOctet)
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop')
- variables:
- TF_VAR_container_tag: $CI_REGISTRY_IMAGE:merge-request
- if: $CI_COMMIT_BRANCH == "integration-test"
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_NIGHTLY
@@ -38,6 +39,29 @@ init:
- gitlab-terraform init
<<: *tf
+tag-images:
+ stage: .pre
+ before_script:
+ - echo "override global before script"
+ image: docker:19.03.12
+ services:
+ - name: docker:19.03.12-dind
+ command: ["--registry-mirror", "http://141.100.70.170:6000", "--dns", "1.1.1.1"]
+ variables:
+ DOCKER_TLS_CERTDIR: "/certs"
+ rules:
+ - if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop')
+ variables:
+ TF_VAR_container_tag: $DOCKER_IMAGE_SHA
+ - if: $CI_COMMIT_BRANCH == "integration-test"
+ - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
+ - if: $CI_NIGHTLY
+ script:
+ - docker info
+ - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
+ - docker pull registry.code.fbi.h-da.de/cocsn/gosdn/ceos:latest
+ - docker tag registry.code.fbi.h-da.de/cocsn/gosdn/ceos:latest registry.code.fbi.h-da.de/cocsn/gosdn/ceos:${CI_PIPELINE_ID}
+
validate:
stage: test
script:
diff --git a/test/integration/nucleusIntegration_test.go b/test/integration/nucleusIntegration_test.go
index 6053a291bf215eb78bfebfa8169095152c6c73f1..25ee1d4df99ff6e5fc74cbc47fec996333224d11 100644
--- a/test/integration/nucleusIntegration_test.go
+++ b/test/integration/nucleusIntegration_test.go
@@ -191,6 +191,8 @@ func TestGnmi_GetIntegration(t *testing.T) {
fields: fields{
opt: &tpb.TransportOption{
Address: "203.0.113.10:6030",
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{}},
},
},
args: args{
@@ -274,7 +276,10 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
{
name: "wrong path",
fields: fields{
- opt: &tpb.TransportOption{},
+ opt: &tpb.TransportOption{
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{}},
+ },
},
args: args{
opts: &gnmi.SubscribeOptions{
@@ -296,6 +301,8 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
fields: fields{
opt: &tpb.TransportOption{
Address: "203.0.113.10:6030",
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{}},
},
},
args: args{
@@ -373,6 +380,8 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
name: "destination unreachable",
fields: fields{opt: &tpb.TransportOption{
Address: "203.0.113.10:6030",
+ TransportOption: &tpb.TransportOption_GnmiTransportOption{
+ GnmiTransportOption: &tpb.GnmiTransportOption{}},
},
},
args: args{ctx: context.Background()},
diff --git a/test/terraform/images.tf b/test/terraform/images.tf
index 39d234b387f5b14a704a028b6b7f31f39a217218..990cf0efdebee846ae4b7fb688c9abd27eb1c0b6 100644
--- a/test/terraform/images.tf
+++ b/test/terraform/images.tf
@@ -3,5 +3,5 @@ resource "docker_image" "gosdn" {
}
resource "docker_image" "ceos" {
- name = "registry.code.fbi.h-da.de/cocsn/gosdn/ceos:latest"
+ name = var.ceos_tag
}
\ No newline at end of file
diff --git a/test/terraform/variables.tf b/test/terraform/variables.tf
index 6d8c0b9894a7671f9658ba983ea797bfbda797eb..3eae3d9d717557d5657d509fd3939d48309b690c 100644
--- a/test/terraform/variables.tf
+++ b/test/terraform/variables.tf
@@ -9,6 +9,7 @@ variable "integration_username" {
variable "integration_access_token" {
type = string
}
+
variable "tls_key" {
type = string
}
@@ -26,6 +27,11 @@ variable "container_tag" {
default = "registry.code.fbi.h-da.de/cocsn/gosdn:latest"
}
+variable "ceos_tag" {
+ type = string
+ default = "registry.code.fbi.h-da.de/cocsn/gosdn/ceos:latest"
+}
+
variable "network_name" {
type = string
default = ""