Skip to content
Snippets Groups Projects
Commit 9a8420b8 authored by Neil-Jocelyn Schark's avatar Neil-Jocelyn Schark
Browse files

Unify pipeline

See merge request !289
parent 4016da44
Branches
Tags
2 merge requests!289Unify pipeline,!264WIP: Develop
Pipeline #99499 failed
...@@ -4,6 +4,10 @@ variables: ...@@ -4,6 +4,10 @@ variables:
CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.0F" CEOS_IMAGE: "${CI_PCONTAINERS_REGISTRY_IMAGE}/ceos:4.28.0F"
GOLANG_VERSION: "1.18" GOLANG_VERSION: "1.18"
workflow:
rules:
- if: $CI_PIPELINE_SOURCE == 'push'
stages: stages:
- build - build
- test - test
......
...@@ -27,8 +27,6 @@ build-testing-image: ...@@ -27,8 +27,6 @@ build-testing-image:
build-image: build-image:
rules: rules:
- if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
when: never
- if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH - if: $CI_COMMIT_BRANCH == $CI_DEFAULT_BRANCH
variables: variables:
TAG: $CI_DEFAULT_BRANCH TAG: $CI_DEFAULT_BRANCH
......
...@@ -5,10 +5,6 @@ variables: ...@@ -5,10 +5,6 @@ variables:
containerlab-deploy: containerlab-deploy:
stage: integration-test stage: integration-test
rules:
- if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
when: never
- when: on_success
tags: tags:
- shell-containerlab - shell-containerlab
needs: ["build-image", "build-testing-image"] needs: ["build-image", "build-testing-image"]
...@@ -43,10 +39,6 @@ containerlab-deploy: ...@@ -43,10 +39,6 @@ containerlab-deploy:
containerlab-destroy: containerlab-destroy:
rules:
- if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
when: never
- when: always
stage: integration-test stage: integration-test
tags: tags:
- shell-containerlab - shell-containerlab
......
.integration-test: &integration-test .integration-test: &integration-test
image: $GOSDN_TESTING_IMAGE image: $GOSDN_TESTING_IMAGE
stage: integration-test stage: integration-test
rules:
- if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
when: never
- when: on_success
needs: needs:
["containerlab-deploy"] ["containerlab-deploy"]
variables: variables:
......
.rules: &rules .rules: &rules
stage: analyze stage: analyze
rules:
- if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
when: never
- when: always
needs: [] needs: []
sast: sast:
...@@ -36,10 +32,6 @@ semgrep-sast: ...@@ -36,10 +32,6 @@ semgrep-sast:
container_scanning: container_scanning:
stage: analyze stage: analyze
rules:
- if: '$CI_PIPELINE_SOURCE != "merge_request_event"'
when: never
- when: always
variables: variables:
DOCKER_IMAGE: "${GOSDN_IMAGE}" DOCKER_IMAGE: "${GOSDN_IMAGE}"
DOCKER_USER: "${CI_REGISTRY_USER}" DOCKER_USER: "${CI_REGISTRY_USER}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment