Skip to content
Snippets Groups Projects
Commit 3af3352d authored by Manuel Kieweg's avatar Manuel Kieweg
Browse files

Merge branch 'integration-test-transport-options' into 'develop'

add proper transport options

See merge request cocsn/gosdn!167
parents 12d2e6a1 c658241f
No related branches found
No related tags found
9 merge requests!246Develop,!245Develop into Master,!244Master into develop2 into master,!219Draft: Testing,!214Test pipelines,!195DO NOT MERGE 2,!194DO NOT MERGE! just for testing,!167add proper transport options,!138Develop
Pipeline #75404 failed
variables: variables:
SECURE_ANALYZERS_PREFIX: registry.gitlab.com/gitlab-org/security-products/analyzers 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: stages:
- .pre - .pre
......
variables: variables:
DOCKER_TLS_CERTDIR: "/certs" DOCKER_TLS_CERTDIR: "/certs"
DOCKER_IMAGE_SHA: $CI_REGISTRY_IMAGE:$CI_COMMIT_SHA
.build: &build .build: &build
before_script: before_script:
...@@ -10,7 +8,6 @@ variables: ...@@ -10,7 +8,6 @@ variables:
services: services:
- name: docker:19.03.12-dind - name: docker:19.03.12-dind
command: ["--registry-mirror", "http://141.100.70.170:6000", "--dns", "1.1.1.1"] command: ["--registry-mirror", "http://141.100.70.170:6000", "--dns", "1.1.1.1"]
stage: build stage: build
tags: tags:
- dind - dind
...@@ -25,6 +22,7 @@ variables: ...@@ -25,6 +22,7 @@ variables:
- docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY - docker login -u gitlab-ci-token -p $CI_JOB_TOKEN $CI_REGISTRY
- docker push $DOCKER_IMAGE_SHA - docker push $DOCKER_IMAGE_SHA
- docker tag $DOCKER_IMAGE_SHA $TAG - 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 - docker push $TAG
build:develop: build:develop:
......
...@@ -2,6 +2,7 @@ ...@@ -2,6 +2,7 @@
variables: variables:
TF_ROOT: ${CI_PROJECT_DIR}/test/terraform TF_ROOT: ${CI_PROJECT_DIR}/test/terraform
TF_ADDRESS: ${CI_API_V4_URL}/projects/${CI_PROJECT_ID}/terraform/state/${CI_PIPELINE_ID} 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: cache:
key: ${CI_PIPELINE_ID} key: ${CI_PIPELINE_ID}
...@@ -19,6 +20,8 @@ cache: ...@@ -19,6 +20,8 @@ cache:
- export TF_VAR_integration_username=terraform - export TF_VAR_integration_username=terraform
- export TF_VAR_integration_access_token=${TERRAFORM_API_TOKEN} - export TF_VAR_integration_access_token=${TERRAFORM_API_TOKEN}
- export TF_VAR_integration_registry=${CI_REGISTRY} - 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_key=${DOCKER_TLS_KEY}
- export TF_VAR_tls_cert=${DOCKER_TLS_CERT} - export TF_VAR_tls_cert=${DOCKER_TLS_CERT}
- export TF_VAR_tls_ca_cert=${DOCKER_TLS_CA} - export TF_VAR_tls_ca_cert=${DOCKER_TLS_CA}
...@@ -26,8 +29,6 @@ cache: ...@@ -26,8 +29,6 @@ cache:
- export TF_VAR_gosdn_address=172.24.$(cat secondOctet).$(cat firstOctet) - export TF_VAR_gosdn_address=172.24.$(cat secondOctet).$(cat firstOctet)
rules: rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && ($CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH || $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == 'develop') - 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 == "integration-test"
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_NIGHTLY - if: $CI_NIGHTLY
...@@ -38,6 +39,29 @@ init: ...@@ -38,6 +39,29 @@ init:
- gitlab-terraform init - gitlab-terraform init
<<: *tf <<: *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: validate:
stage: test stage: test
script: script:
......
...@@ -191,6 +191,8 @@ func TestGnmi_GetIntegration(t *testing.T) { ...@@ -191,6 +191,8 @@ func TestGnmi_GetIntegration(t *testing.T) {
fields: fields{ fields: fields{
opt: &tpb.TransportOption{ opt: &tpb.TransportOption{
Address: "203.0.113.10:6030", Address: "203.0.113.10:6030",
TransportOption: &tpb.TransportOption_GnmiTransportOption{
GnmiTransportOption: &tpb.GnmiTransportOption{}},
}, },
}, },
args: args{ args: args{
...@@ -274,7 +276,10 @@ func TestGnmi_SubscribeIntegration(t *testing.T) { ...@@ -274,7 +276,10 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
{ {
name: "wrong path", name: "wrong path",
fields: fields{ fields: fields{
opt: &tpb.TransportOption{}, opt: &tpb.TransportOption{
TransportOption: &tpb.TransportOption_GnmiTransportOption{
GnmiTransportOption: &tpb.GnmiTransportOption{}},
},
}, },
args: args{ args: args{
opts: &gnmi.SubscribeOptions{ opts: &gnmi.SubscribeOptions{
...@@ -296,6 +301,8 @@ func TestGnmi_SubscribeIntegration(t *testing.T) { ...@@ -296,6 +301,8 @@ func TestGnmi_SubscribeIntegration(t *testing.T) {
fields: fields{ fields: fields{
opt: &tpb.TransportOption{ opt: &tpb.TransportOption{
Address: "203.0.113.10:6030", Address: "203.0.113.10:6030",
TransportOption: &tpb.TransportOption_GnmiTransportOption{
GnmiTransportOption: &tpb.GnmiTransportOption{}},
}, },
}, },
args: args{ args: args{
...@@ -373,6 +380,8 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) { ...@@ -373,6 +380,8 @@ func TestGnmi_CapabilitiesIntegration(t *testing.T) {
name: "destination unreachable", name: "destination unreachable",
fields: fields{opt: &tpb.TransportOption{ fields: fields{opt: &tpb.TransportOption{
Address: "203.0.113.10:6030", Address: "203.0.113.10:6030",
TransportOption: &tpb.TransportOption_GnmiTransportOption{
GnmiTransportOption: &tpb.GnmiTransportOption{}},
}, },
}, },
args: args{ctx: context.Background()}, args: args{ctx: context.Background()},
......
...@@ -3,5 +3,5 @@ resource "docker_image" "gosdn" { ...@@ -3,5 +3,5 @@ resource "docker_image" "gosdn" {
} }
resource "docker_image" "ceos" { 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
...@@ -9,6 +9,7 @@ variable "integration_username" { ...@@ -9,6 +9,7 @@ variable "integration_username" {
variable "integration_access_token" { variable "integration_access_token" {
type = string type = string
} }
variable "tls_key" { variable "tls_key" {
type = string type = string
} }
...@@ -26,6 +27,11 @@ variable "container_tag" { ...@@ -26,6 +27,11 @@ variable "container_tag" {
default = "registry.code.fbi.h-da.de/cocsn/gosdn:latest" 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" { variable "network_name" {
type = string type = string
default = "" default = ""
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment