diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ca9b96403403231ff452d8fd94b9fe9207c104be..73cc579877189b65669bdf1a45f51d27aa26bb3e 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,6 +2,7 @@ stages: - test - sonar - build + - mend test: stage: test @@ -64,4 +65,25 @@ build_and_push_release_image: docker login -u $DOCKER_USERNAME -p $DOCKER_PASSWORD $DOCKER_REPOSITORY docker build -t $DOCKER_REPOSITORY_LOCAL:$IMAGE_TAG . docker push $DOCKER_REPOSITORY_LOCAL:$IMAGE_TAG - docker logout $DOCKER_REPOSITORY \ No newline at end of file + docker logout $DOCKER_REPOSITORY + +mend: + stage: mend + image: openjdk:17-jdk-slim + only: + - /^release/ + variables: + PRODUCT_NAME: "nmaas" + PROJECT_NAME: "nmaas-portal" + script: + - | + export PRODUCT_VERSION=$(echo $CI_COMMIT_BRANCH | cut -c 9-) + export PROJECT_VERSION=$PRODUCT_VERSION + apt-get update && apt-get install -y curl gnupg + curl -sL https://deb.nodesource.com/setup_11.x | bash - + apt-get -y install nodejs + npm install -g @angular/cli + npm ci + chmod +x ./gradlew + curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar + java -jar wss-unified-agent.jar -userKey ${MEND_USER_KEY} -apiKey ${MEND_API_KEY} -projectVersion ${PROJECT_VERSION} -project ${PROJECT_NAME} -productVersion ${PRODUCT_VERSION} -product ${PRODUCT_NAME} -c ./ws/ws.config -d ./ \ No newline at end of file diff --git a/package-lock.json b/package-lock.json index 881b777c79885b41a9fc397b3d9c20efa1751599..2a4d17934a1608ed75f4f025a032daf43a966821 100644 --- a/package-lock.json +++ b/package-lock.json @@ -1,12 +1,12 @@ { "name": "nmaas-portal", - "version": "1.7.0", + "version": "1.7.1", "lockfileVersion": 2, "requires": true, "packages": { "": { "name": "nmaas-portal", - "version": "1.7.0", + "version": "1.7.1", "license": "Apache 2.0", "dependencies": { "@angular/animations": "17.3.12", diff --git a/package.json b/package.json index 9402af9537167709179f216f116de9a9ef4cbefa..8f55d7ac4f42805f54c1b02aa107d713e937060b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "nmaas-portal", - "version": "1.7.0", + "version": "1.7.1", "license": "Apache 2.0", "angular-cli": {}, "scripts": { diff --git a/ws/run_ws.sh b/ws/run_ws.sh deleted file mode 100644 index 8763a587feed5aac2fcb74b297ebaed9481b0859..0000000000000000000000000000000000000000 --- a/ws/run_ws.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/sh - -echo "Downloading WhiteSource agent..." -curl -LJO https://github.com/whitesource/unified-agent-distribution/releases/latest/download/wss-unified-agent.jar - -echo "Running WhiteSource scan..." -java -jar wss-unified-agent.jar -userKey ${USER_KEY} -apiKey ${API_KEY} -projectVersion ${PROJECT_VERSION} -projectToken ${PROJECT_TOKEN} -productVersion ${PRODUCT_VERSION} -productToken ${PRODUCT_TOKEN} -c ws.config -d ../ \ No newline at end of file