Skip to content
Snippets Groups Projects
Unverified Commit c2f40a28 authored by Luc Everse's avatar Luc Everse :passport_control:
Browse files

Merge branch 'development' into better-assembly-analysis

parents 247992fa 965de732
Branches better-assembly-analysis
Tags
2 merge requests!148Release 2.3.0,!139Better assembly analysis
Pipeline #372354 passed with warnings
......@@ -73,6 +73,8 @@ stages:
# - dast
- staging
- canary
- jar
- publish
- production
- incremental rollout 10%
- incremental rollout 25%
......@@ -127,17 +129,71 @@ trampoline-feedback:
expire_in: 1 week
checkstyle:
stage: test
# image: $CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
image: wukl/auta-build:0.1.0
stage: test
script:
- ./gradlew checkstyleMain checkstyleTest
spotbugs:
stage: test
# image: $CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
image: wukl/auta-build:0.1.0
stage: test
script:
- ./gradlew :spotbugsMain :core:spotbugsMain :worker:spotbugsMain
jar-core:
# image: $CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
image: wukl/auta-build:0.1.0
stage: jar
script:
- ./gradlew bootJar
artifacts:
paths:
- core/build/libs/core-*.jar
expire_in: 1h
jar-worker:
# image: $CI_REGISTRY/$CI_PROJECT_PATH/$CI_COMMIT_REF_NAME:$CI_COMMIT_SHA
image: wukl/auta-build:0.1.0
stage: jar
script:
- ./gradlew :worker:jar
artifacts:
paths:
- worker/build/libs/worker-*.jar
expire_in: 1h
publish-core:
image: registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable
variables:
DOCKER_TLS_CERTDIR: ""
services:
- docker:19.03.5-dind
only:
- branches
stage: publish
dependencies:
- jar-core
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- devops/build-slim-image core $CI_COMMIT_REF_NAME
publish-worker:
image: registry.gitlab.com/gitlab-org/cluster-integration/auto-build-image/master:stable
variables:
DOCKER_TLS_CERTDIR: ""
services:
- docker:19.03.5-dind
only:
- branches
stage: publish
dependencies:
- jar-worker
script:
- docker login -u $CI_REGISTRY_USER -p $CI_REGISTRY_PASSWORD $CI_REGISTRY
- devops/build-slim-image worker $CI_COMMIT_REF_NAME
# Override DAST job to exclude master branch
#dast:
# except:
......
#!/bin/bash
set -e
COMPONENT=$1
TAG=$2
if [ -z "$COMPONENT" ] || [ "$COMPONENT" = all ]
then
./$0 core $TAG
./$0 worker $TAG
exit
fi
if [ -n "$TAG" ]
then
TAG=-$TAG
fi
VERSION=$(grep -o " version = '[^']*'" build.gradle | cut -d "'" -f 2 | tr -d '\n')
/bin/echo -e "\033[33;1mReleasing AuTA $COMPONENT v$VERSION$TAG\033[0m"
if [ $COMPONENT = core ]
then
ARGS=
else
ARGS='host=$COREADDRESS name=$WORKERNAME api-token=$APIKEY api-protocol=$APIPROTOCOL api-port=$APIPORT docker-api=$DOCKERAPI'
fi
docker build --no-cache --pull -t $CI_REGISTRY/$CI_PROJECT_PATH/$COMPONENT -f slim-$COMPONENT.Dockerfile . \
--build-arg VERSION=$VERSION --build-arg COMPONENT=$COMPONENT --build-arg ARGS="$ARGS"
if [ "$TAG" = -local ]
then
exit
fi
if [ "$TAG" = -latest ] || [ "$TAG" = -master ]
then
docker push $CI_REGISTRY/$CI_PROJECT_PATH/$COMPONENT
else
docker tag $CI_REGISTRY/$CI_PROJECT_PATH/$COMPONENT $CI_REGISTRY/$CI_PROJECT_PATH/$COMPONENT:$VERSION$TAG
docker push $CI_REGISTRY/$CI_PROJECT_PATH/$COMPONENT:$VERSION$TAG
fi
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment