Commit c926f8a4 authored by Manuel Kieweg's avatar Manuel Kieweg 🤷
Browse files

Merge branch 'nightly' into 'master'

move go version to 1.16 and change check for absence of $CI_NIGHTLY

See merge request cocsn/gosdn!142
parents 7355ac97 04ff7299
FROM golang:1.15-buster AS builder
FROM golang:1.16-buster AS builder
ARG GITLAB_USER
ARG GITLAB_TOKEN
ARG BUILDARGS
......
......@@ -30,7 +30,7 @@ build:develop:
TAG: $CI_REGISTRY_IMAGE:develop
BUILDARGS: -race
rules:
- if: $CI_COMMIT_BRANCH == "develop"
- if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == null
<<: *build
build:nightly:develop:
......@@ -60,5 +60,5 @@ build:latest:
variables:
TAG: $CI_REGISTRY_IMAGE:latest
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_NIGHTLY == null
<<: *build
\ No newline at end of file
......@@ -40,7 +40,7 @@ deploy:develop:
- job: "build:k8s-bot"
artifacts: true
rules:
- if: $CI_COMMIT_BRANCH == "develop"
- if: $CI_COMMIT_BRANCH == "develop" && $CI_NIGHTLY == null
deploy:latest:
<<: *deploy
......@@ -50,7 +50,7 @@ deploy:latest:
- job: "build:k8s-bot"
artifacts: true
rules:
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_NIGHTLY == ""
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH && $CI_NIGHTLY == null
deploy:nightly:mainline:
<<: *deploy
......
......@@ -26,6 +26,7 @@ cache:
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
init:
stage: .pre
......
integration-test:
image: golang:1.14
image: golang:1.16
stage: integration-test
needs:
- job: "apply"
......@@ -8,6 +8,9 @@ integration-test:
GOSDN_LOG: "nolog"
GOSDN_TEST_API_ENDPOINT: http://gosdn-$CI_COMMIT_SHA.apps.ocp.fbi.h-da.de/api
rules:
- if: $CI_NIGHTLY
when: delayed
start_in: 2 minutes
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
when: delayed
start_in: 2 minutes
......@@ -19,13 +22,14 @@ integration-test:
- go test -race ./test/integration -v -coverprofile=coverage.out
.test: &test
image: golang:1.14
image: golang:1.16
stage: test
allow_failure: true
variables:
GOSDN_LOG: "nolog"
rules:
- if: $CI_PIPELINE_SOURCE == "merge_request_event" && $CI_MERGE_REQUEST_TARGET_BRANCH_NAME == $CI_DEFAULT_BRANCH
- if: $CI_NIGHTLY
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
- if: $CI_COMMIT_BRANCH != $CI_DEFAULT_BRANCH
allow_failure: true
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment