From 2002178f37f6892f59c3407ad9aa5809c09b5e70 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Thu, 17 Mar 2022 23:11:06 +0100 Subject: [PATCH 01/29] changed docker registry --- ci/jfrog/pipelines.steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index f4e8c98..4fd40fe 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -80,7 +80,7 @@ pipelines: configuration: environmentVariables: readOnly: - registryFQDN: yann-sbx.dev.gcp.devopsacc.team + registryFQDN: platform-eu.stg.gcp.devopsacc.team dockerRepoName: urs-docker skipScan: "true" pushRepo: urs-docker-dev-local From b43c2774577a8b4da1f318fcb680f15db8f2739b Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 13:53:53 +0100 Subject: [PATCH 02/29] JFrog pipelines : pull runtime image from local RT --- ci/jfrog/pipelines.steps.yml | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index 4fd40fe..cac5701 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -9,10 +9,18 @@ pipelines: - name: build_backapp_mvn type: MvnBuild configuration: + runtime: + type: image + image: + custom: + name: platform-eu.stg.gcp.devopsacc.team/urs-docker/pipelines-u18java + tag: 11 + registry: artifactory_docker + sourceRepository: urs-docker environmentVariables: JFROG_CLI_BUILD_NAME: "{{ gitBranch }}_backapp_mvn" JFROG_CLI_BUILD_URL: "${step_url}${res_src_code_backapp_mvn_branchName}" - JFROG_CLI_LOG_LEVEL: DEBUG + JFROG_CLI_LOG_LEVEL: INFO M2_HOME: /usr/local/apache-maven-3.6.3/ mvnCommand: clean package --no-transfer-progress sourceLocation: src @@ -28,6 +36,7 @@ pipelines: - name: bi_backapp_mvn integrations: - name: artifactory_eu + - name: artifactory_docker execution: onStart: - ls -l ${res_src_code_backapp_mvn_resourcePath}/src From fd8755137ddbb7962b68650fdc0bad835c6491d2 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 13:55:27 +0100 Subject: [PATCH 03/29] JFrog Pipelines : fixed tag --- ci/jfrog/pipelines.steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index cac5701..88fb258 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -14,7 +14,7 @@ pipelines: image: custom: name: platform-eu.stg.gcp.devopsacc.team/urs-docker/pipelines-u18java - tag: 11 + tag: "11" registry: artifactory_docker sourceRepository: urs-docker environmentVariables: From 25aae3d4d4e8d53523901d73556fd3f13a97dfe6 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 13:59:39 +0100 Subject: [PATCH 04/29] quick fix --- ci/jfrog/pipelines.steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index 88fb258..2f779cc 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -13,7 +13,7 @@ pipelines: type: image image: custom: - name: platform-eu.stg.gcp.devopsacc.team/urs-docker/pipelines-u18java + name: platform-eu.stg.gcp.devopsacc.team/urs-docker/jfrog/pipelines-u18java tag: "11" registry: artifactory_docker sourceRepository: urs-docker From 9e819dd46dfe9f352ccbb99ecc1eeb038755c671 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 14:19:57 +0100 Subject: [PATCH 05/29] upgrade image tag --- ci/jfrog/pipelines.steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index 2f779cc..d6f2316 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -14,7 +14,7 @@ pipelines: image: custom: name: platform-eu.stg.gcp.devopsacc.team/urs-docker/jfrog/pipelines-u18java - tag: "11" + tag: "14" registry: artifactory_docker sourceRepository: urs-docker environmentVariables: From 5122ea85637731ea4d91de0d1d2bbb02a29fe19d Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 14:26:36 +0100 Subject: [PATCH 06/29] quick test --- src/Dockerfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/Dockerfile b/src/Dockerfile index 522b4ea..5eb537a 100644 --- a/src/Dockerfile +++ b/src/Dockerfile @@ -4,7 +4,7 @@ ARG DOCKER_REPO=urs-docker FROM $REGISTRY/$DOCKER_REPO/groovy:jre16 # https://docs.docker.com/engine/reference/builder/#understand-how-arg-and-from-interact -# ARG REGISTRY +ARG REGISTRY # dummy RUN mkdir -p /home/groovy/webapp/ From a1cc95bf6ee75cf31c7dfbaf510f87228cdae045 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 14:51:23 +0100 Subject: [PATCH 07/29] added authentication for docker build --- ci/jfrog/pipelines.steps.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index d6f2316..bf11749 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -126,6 +126,7 @@ pipelines: - name: fs_backapp_mvn integrations: - name: artifactory_eu + - name: aretifactory_docker execution: onStart: # - pwd && ls -l From 332003afdc7c552cf04d5bd0afb17ffe4995f9ac Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 14:52:08 +0100 Subject: [PATCH 08/29] fixed typo --- ci/jfrog/pipelines.steps.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index bf11749..169d97a 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -126,7 +126,7 @@ pipelines: - name: fs_backapp_mvn integrations: - name: artifactory_eu - - name: aretifactory_docker + - name: artifactory_docker execution: onStart: # - pwd && ls -l From c061f5191105f2983bd94ae371ea8a2905df5da6 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 16:36:07 +0100 Subject: [PATCH 09/29] modify integration --- ci/jfrog/pipelines.steps.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/jfrog/pipelines.steps.yml b/ci/jfrog/pipelines.steps.yml index 169d97a..bfc9462 100644 --- a/ci/jfrog/pipelines.steps.yml +++ b/ci/jfrog/pipelines.steps.yml @@ -35,7 +35,7 @@ pipelines: outputResources: - name: bi_backapp_mvn integrations: - - name: artifactory_eu + - name: artifactory_eu_https - name: artifactory_docker execution: onStart: @@ -125,7 +125,7 @@ pipelines: - name: src_dockerfile_backapp_mvn - name: fs_backapp_mvn integrations: - - name: artifactory_eu + - name: artifactory_eu_https - name: artifactory_docker execution: onStart: @@ -152,7 +152,7 @@ pipelines: inputSteps: - name: build_backapp_mvn_docker integrations: - - name: artifactory_eu + - name: artifactory_eu_https outputResources: - name: bi_backapp_mvn_docker execution: From c9af53487dbda48a9317bbebb3e8780b46759900 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 17:57:49 +0100 Subject: [PATCH 10/29] updated resources --- ci/jfrog/pipelines.resources.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/ci/jfrog/pipelines.resources.yml b/ci/jfrog/pipelines.resources.yml index 8d3531d..03fa947 100644 --- a/ci/jfrog/pipelines.resources.yml +++ b/ci/jfrog/pipelines.resources.yml @@ -49,20 +49,20 @@ resources: - name: fs_backapp_mvn type: FileSpec configuration: - sourceArtifactory: artifactory_eu + sourceArtifactory: artifactory_eu_https pattern: "urs-mvn/**/multi-module-application-${runVarAppVersion}.jar" flat: true - name: bi_backapp_mvn_docker type: BuildInfo configuration: - sourceArtifactory: artifactory_eu + sourceArtifactory: artifactory_eu_https buildName: {{ gitBranch }}_backapp_mvn_docker buildNumber: ${run_number} - name: bi_backapp_mvn_docker_promoted type: BuildInfo configuration: - sourceArtifactory: artifactory_eu + sourceArtifactory: artifactory_eu_https buildName: {{ gitBranch }}_backapp_mvn_docker buildNumber: ${run_number} From ae979f8c5073564e17f7245ed472ef5e659ef89b Mon Sep 17 00:00:00 2001 From: cyan21 Date: Fri, 18 Mar 2022 18:11:16 +0100 Subject: [PATCH 11/29] updated resources 2 --- ci/jfrog/pipelines.resources.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jfrog/pipelines.resources.yml b/ci/jfrog/pipelines.resources.yml index 03fa947..437ac15 100644 --- a/ci/jfrog/pipelines.resources.yml +++ b/ci/jfrog/pipelines.resources.yml @@ -17,14 +17,14 @@ resources: - name: bi_backapp_mvn type: BuildInfo configuration: - sourceArtifactory: artifactory_eu + sourceArtifactory: artifactory_eu_https buildName: {{ gitBranch }}_backapp_mvn buildNumber: ${run_number} - name: bi_backapp_mvn_promoted type: BuildInfo configuration: - sourceArtifactory: artifactory_eu + sourceArtifactory: artifactory_eu_https buildName: {{ gitBranch }}_backapp_mvn buildNumber: ${run_number} From 6ca2807fd5c1bda3d0d3a6ad3d97decf1a293184 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Mon, 21 Mar 2022 22:11:01 +0100 Subject: [PATCH 12/29] enable auto push --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index b5b1eb9..f60eb2c 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -155,7 +155,7 @@ pipeline { rtMavenRun ( pom: "pom.xml", - goals: 'clean package -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', + goals: 'clean package -Dartifactory.publish.artifacts=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', deployerId: "MAVEN_DEPLOYER", resolverId: "MAVEN_RESOLVER", buildName: env.MY_BUILD_NAME, From 89d9f8892a4c75dbe17e22942d89015ea36ec839 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Mon, 21 Mar 2022 22:19:58 +0100 Subject: [PATCH 13/29] tentative fix for mvn deployment --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index f60eb2c..a9474d6 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -155,7 +155,7 @@ pipeline { rtMavenRun ( pom: "pom.xml", - goals: 'clean package -Dartifactory.publish.artifacts=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', + goals: 'clean install -Dartifactory.publish.artifacts=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', deployerId: "MAVEN_DEPLOYER", resolverId: "MAVEN_RESOLVER", buildName: env.MY_BUILD_NAME, From 02ccbd148259d67e249946ee532c25e3a4dadf8a Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 21:14:28 +0100 Subject: [PATCH 14/29] fixed xray audit and publish artifacts --- ci/jenkins/Jenkinsfile | 17 ++++++++++------- 1 file changed, 10 insertions(+), 7 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index a9474d6..cabc664 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -118,15 +118,15 @@ pipeline { id: "MAVEN_DEPLOYER", serverId: env.ART_ID, properties: ["app.name=${params.APP_NAME}","app.version=${params.NEW_VERSION}"], - releaseRepo: env.MVN_REPO, - snapshotRepo: env.MVN_REPO + releaseRepo: params.MVN_REPO, + snapshotRepo: params.MVN_REPO ) rtMavenResolver ( id: "MAVEN_RESOLVER", serverId: env.ART_ID, - releaseRepo: env.MVN_REPO, - snapshotRepo: env.MVN_REPO + releaseRepo: params.MVN_REPO, + snapshotRepo: params.MVN_REPO ) rtBuildInfo ( @@ -135,7 +135,7 @@ pipeline { buildName: env.MY_BUILD_NAME, buildNumber: env.BUILD_NUMBER, - maxBuilds: 1, + maxBuilds: 1, // doNotDiscardBuilds: ['4'], // deleteBuildArtifacts: true ) @@ -149,13 +149,16 @@ pipeline { --user=${ARTY_CREDS_USR} \ --password="${ARTY_CREDS_PSW}" \ yann-rt + ./jf mvn-config \ + --server-id-resolve=yann-rt \ + --repo-resolve-releases=${params.MVN_REPO} \ + --repo-resolve-snapshots=${params.MVN_REPO} ./jf audit-mvn - """ rtMavenRun ( pom: "pom.xml", - goals: 'clean install -Dartifactory.publish.artifacts=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', + goals: 'clean package -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', deployerId: "MAVEN_DEPLOYER", resolverId: "MAVEN_RESOLVER", buildName: env.MY_BUILD_NAME, From 55310dab78efa723a893a61826344d8d4b553372 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 21:24:06 +0100 Subject: [PATCH 15/29] tentative fix --- ci/jenkins/Jenkinsfile | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index cabc664..2813850 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -92,7 +92,11 @@ pipeline { steps { container('maven') { - git branch: params.MY_GIT_BRANCH , url: params.MY_GIT_URL + //git branch: params.MY_GIT_BRANCH , url: params.MY_GIT_URL + sh """#!/bin/sh + apk add git curl openjdk11 jq + git clone ${params.MY_GIT_URL} -b ${params.MY_GIT_BRANCH} + """ dir ("src") { From d93a0ba6fd364545b514dd4dc06df6e568f6ff99 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 21:32:59 +0100 Subject: [PATCH 16/29] updated mvn container image --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 2813850..67d3e13 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -10,7 +10,7 @@ pipeline { spec: containers: - name: maven - image: maven:alpine + image: maven:3.8.4-eclipse-temurin-11-alpine command: - cat tty: true From 47ca3421ba9a10ffec35ffc6b304ad1bc3542221 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 21:39:33 +0100 Subject: [PATCH 17/29] removed env variables --- ci/jenkins/Jenkinsfile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 67d3e13..de83e84 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -42,8 +42,8 @@ pipeline { DOCKER_BUILD_NAME='jenkins-java-docker' DOCKER_REGISTRY_URL=sh(returnStdout: true, script: """ if [ \"${params.DOCKER_SUB_DOMAIN}\" = \"true\" ]; then echo \"${params.DOCKER_REPO}.${params.JPD_URL}\"; else echo \"${params.JPD_URL}/${params.DOCKER_REPO}\"; fi""").trim() - JAVA_HOME = '/usr/lib/jvm/java-1.8-openjdk/' - MAVEN_HOME = '/usr/share/maven' + //JAVA_HOME = '/usr/lib/jvm/java-1.8-openjdk/' + //MAVEN_HOME = '/usr/share/maven' } parameters { From b239b8e648418e88e036318b90e6f5781fe0c3d4 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 21:42:50 +0100 Subject: [PATCH 18/29] added back MAVEN_HOME env variable --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index de83e84..e0275fc 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -43,7 +43,7 @@ pipeline { DOCKER_REGISTRY_URL=sh(returnStdout: true, script: """ if [ \"${params.DOCKER_SUB_DOMAIN}\" = \"true\" ]; then echo \"${params.DOCKER_REPO}.${params.JPD_URL}\"; else echo \"${params.JPD_URL}/${params.DOCKER_REPO}\"; fi""").trim() //JAVA_HOME = '/usr/lib/jvm/java-1.8-openjdk/' - //MAVEN_HOME = '/usr/share/maven' + MAVEN_HOME = '/usr/share/maven' } parameters { From 7a960ff8baf8fc94180723d5a8465a3c1d99c8bb Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 22:11:22 +0100 Subject: [PATCH 19/29] updated mvn goals --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index e0275fc..c644d7d 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -162,7 +162,7 @@ pipeline { rtMavenRun ( pom: "pom.xml", - goals: 'clean package -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', + goals: 'clean install -Dartifactory.publish.artifacts=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', deployerId: "MAVEN_DEPLOYER", resolverId: "MAVEN_RESOLVER", buildName: env.MY_BUILD_NAME, From d3d0b7cb2c662541545888e6b73afd7fc22e5d3f Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 22:20:34 +0100 Subject: [PATCH 20/29] updated mvn goals --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index c644d7d..b2bc122 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -162,7 +162,7 @@ pipeline { rtMavenRun ( pom: "pom.xml", - goals: 'clean install -Dartifactory.publish.artifacts=true -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', + goals: 'clean install -B -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn', deployerId: "MAVEN_DEPLOYER", resolverId: "MAVEN_RESOLVER", buildName: env.MY_BUILD_NAME, From 28038c98eaa370b11db9b4bcbdf5930c0e15006f Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 22:34:11 +0100 Subject: [PATCH 21/29] tentative fix docker scan --- ci/jenkins/Jenkinsfile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index b2bc122..63d8cb1 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -33,6 +33,7 @@ pipeline { environment { // for docker build ARTY_CREDS=credentials('jenkins_rt') + ARTY_ADMIN_CREDS=credentials('admin_rt') // for RT plugin : should match the ID just above ARTY_CREDS_ID='jenkins_rt' @@ -305,8 +306,8 @@ pipeline { ./jf c show JFROG_CLI_LEVEL=ERROR CI=true ./jf c add \ --url=https://${params.JPD_URL} \ - --user=${ARTY_CREDS_USR} \ - --password="${ARTY_CREDS_PSW}" \ + --user=${ARTY_ADMIN_CREDS_USR} \ + --password="${ARTY_ADMIN_CREDS_PSW}" \ yann-rt JFROG_CLI_LEVEL=DEBUG ./jf docker scan ${env.DOCKER_REGISTRY_URL}/jenkins-javapp:${params.NEW_VERSION} """ From 506de31c30bf3f0bd14b98ae24fd9fb43196f70c Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 22:42:13 +0100 Subject: [PATCH 22/29] 2nd tentative to fix docker scan --- ci/jenkins/Jenkinsfile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 63d8cb1..8f8378e 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -288,7 +288,7 @@ pipeline { ) sh """#!/bin/sh - apk add curl openjdk11 + apk add curl openjdk11 libc6-compat echo ${env.DOCKER_REGISTRY_URL} git_path=`echo ${params.MY_GIT_URL} | cut -d/ -f4,5` echo \${git_path} From 46c8e74a7ce9ea47d592999e1a15a01cc11464a7 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 22 Mar 2022 23:26:32 +0100 Subject: [PATCH 23/29] removed admin creds --- ci/jenkins/Jenkinsfile | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/ci/jenkins/Jenkinsfile b/ci/jenkins/Jenkinsfile index 8f8378e..abc89cd 100644 --- a/ci/jenkins/Jenkinsfile +++ b/ci/jenkins/Jenkinsfile @@ -33,7 +33,6 @@ pipeline { environment { // for docker build ARTY_CREDS=credentials('jenkins_rt') - ARTY_ADMIN_CREDS=credentials('admin_rt') // for RT plugin : should match the ID just above ARTY_CREDS_ID='jenkins_rt' @@ -306,8 +305,8 @@ pipeline { ./jf c show JFROG_CLI_LEVEL=ERROR CI=true ./jf c add \ --url=https://${params.JPD_URL} \ - --user=${ARTY_ADMIN_CREDS_USR} \ - --password="${ARTY_ADMIN_CREDS_PSW}" \ + --user=${ARTY_CREDS_USR} \ + --password="${ARTY_CREDS_PSW}" \ yann-rt JFROG_CLI_LEVEL=DEBUG ./jf docker scan ${env.DOCKER_REGISTRY_URL}/jenkins-javapp:${params.NEW_VERSION} """ From f5b8c5bd96f7aeb6aa8df3b9ae5b728215476e3f Mon Sep 17 00:00:00 2001 From: cyan21 Date: Mon, 4 Apr 2022 15:35:19 +0200 Subject: [PATCH 24/29] adding frogbot --- .github/workflows/frogbot.yml | 52 +++++++++++++++++++++++++++++++++++ 1 file changed, 52 insertions(+) create mode 100644 .github/workflows/frogbot.yml diff --git a/.github/workflows/frogbot.yml b/.github/workflows/frogbot.yml new file mode 100644 index 0000000..b69586c --- /dev/null +++ b/.github/workflows/frogbot.yml @@ -0,0 +1,52 @@ +name: "Frogbot" +on: + # After a pull request opened, Frogbot automatically creates the "🐸 frogbot scan" label if needed. + # After "🐸 frogbot scan" label was added to a pull request, Frogbot scans the pull request. + pull_request_target: + types: [labeled, opened] +jobs: + scan-pull-request: + runs-on: ubuntu-latest + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.event.pull_request.head.sha }} + + # Install prerequisites + - name: Set up Java + uses: actions/setup-java@v3 + with: + java-version: "11" + distribution: "temurin" + + - uses: jfrog/frogbot@v1 + env: + # [Mandatory] + # JFrog platform URL + # JF_URL: ${{ secrets.JF_URL }} + + # [Mandatory if JF_ACCESS_TOKEN is not provided] + # JFrog username with 'read' permissions for Xray. Must be provided with JF_PASSWORD + # JF_USER: ${{ secrets.JF_USER }} + + # [Mandatory if JF_ACCESS_TOKEN is not provided] + # JFrog password. Must be provided with JF_USER + JF_PASSWORD: ${{ secrets.JF_PASSWORD }} + + # [Manadatory] + # The GitHub token automatically generated for the job + JF_GIT_TOKEN: ${{ secrets.GITHUB_TOKEN }} + + # Uncomment the below options if you'd like to use them. + + # [Mandatory if JF_USER and JF_PASSWORD are not provided] + # JFrog access token with 'read' permissions on Xray service + JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} + + # [Optional] + # Xray Watches. Learn more about them here: https://www.jfrog.com/confluence/display/JFROG/Configuring+Xray+Watches + # JF_WATCHES: ,... + + # [Optional] + # JFrog project. Learn more about it here: https://www.jfrog.com/confluence/display/JFROG/Projects + # JF_PROJECT: From 66529da59f280e400d9f143d2adbfafa86adc4a0 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Mon, 4 Apr 2022 15:48:17 +0200 Subject: [PATCH 25/29] bumped springboot --- src/application/pom.xml | 6 +++--- src/library/pom.xml | 4 ++-- src/pom.xml | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/application/pom.xml b/src/application/pom.xml index 8e5e921..dc61795 100644 --- a/src/application/pom.xml +++ b/src/application/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.RELEASE + 2.6.0 com.example multi-module-application - 2.0.0 + 3.0.0 multi-module-application Demo project for Spring Boot @@ -30,7 +30,7 @@ com.example multi-module-library - 2.0.0 + 3.0.0 diff --git a/src/library/pom.xml b/src/library/pom.xml index 29d4e9b..7bc667c 100644 --- a/src/library/pom.xml +++ b/src/library/pom.xml @@ -5,12 +5,12 @@ org.springframework.boot spring-boot-starter-parent - 2.2.0.RELEASE + 2.6.0 com.example multi-module-library - 2.0.0 + 3.0.0 multi-module-library Demo project for Spring Boot diff --git a/src/pom.xml b/src/pom.xml index 3edf81d..902482c 100644 --- a/src/pom.xml +++ b/src/pom.xml @@ -5,7 +5,7 @@ com.example gs-multi-module - 2.0.0 + 3.0.0 pom From 85d0f62fcc8f6409c64494f56bc1909f38732389 Mon Sep 17 00:00:00 2001 From: cyan21 Date: Mon, 4 Apr 2022 18:37:18 +0200 Subject: [PATCH 26/29] fixed frogbot --- .github/workflows/frogbot.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/frogbot.yml b/.github/workflows/frogbot.yml index b69586c..ec365a1 100644 --- a/.github/workflows/frogbot.yml +++ b/.github/workflows/frogbot.yml @@ -23,7 +23,7 @@ jobs: env: # [Mandatory] # JFrog platform URL - # JF_URL: ${{ secrets.JF_URL }} + JF_URL: ${{ secrets.JF_URL }} # [Mandatory if JF_ACCESS_TOKEN is not provided] # JFrog username with 'read' permissions for Xray. Must be provided with JF_PASSWORD @@ -31,7 +31,7 @@ jobs: # [Mandatory if JF_ACCESS_TOKEN is not provided] # JFrog password. Must be provided with JF_USER - JF_PASSWORD: ${{ secrets.JF_PASSWORD }} + # JF_PASSWORD: ${{ secrets.JF_PASSWORD }} # [Manadatory] # The GitHub token automatically generated for the job From 4185d6e9f2b32f09ce4cf63ed3dc519dbe4cd79e Mon Sep 17 00:00:00 2001 From: cyan21 Date: Mon, 4 Apr 2022 18:44:02 +0200 Subject: [PATCH 27/29] fixed token name --- .github/workflows/frogbot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot.yml b/.github/workflows/frogbot.yml index ec365a1..6f14b68 100644 --- a/.github/workflows/frogbot.yml +++ b/.github/workflows/frogbot.yml @@ -41,7 +41,7 @@ jobs: # [Mandatory if JF_USER and JF_PASSWORD are not provided] # JFrog access token with 'read' permissions on Xray service - JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} + JF_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} # [Optional] # Xray Watches. Learn more about them here: https://www.jfrog.com/confluence/display/JFROG/Configuring+Xray+Watches From 35e0bb331e9d3a7844a28067dcee25217108a2ad Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 12 Apr 2022 09:17:30 +0200 Subject: [PATCH 28/29] fixed env var --- .github/workflows/frogbot.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/frogbot.yml b/.github/workflows/frogbot.yml index 6f14b68..ec365a1 100644 --- a/.github/workflows/frogbot.yml +++ b/.github/workflows/frogbot.yml @@ -41,7 +41,7 @@ jobs: # [Mandatory if JF_USER and JF_PASSWORD are not provided] # JFrog access token with 'read' permissions on Xray service - JF_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} + JF_ACCESS_TOKEN: ${{ secrets.JF_ACCESS_TOKEN }} # [Optional] # Xray Watches. Learn more about them here: https://www.jfrog.com/confluence/display/JFROG/Configuring+Xray+Watches From abdb8d405171abb52c2e083da0c80f00d899494a Mon Sep 17 00:00:00 2001 From: cyan21 Date: Tue, 12 Apr 2022 09:26:43 +0200 Subject: [PATCH 29/29] updated message --- src/application/src/main/resources/application.properties | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/application/src/main/resources/application.properties b/src/application/src/main/resources/application.properties index 5f2ddfa..2291619 100644 --- a/src/application/src/main/resources/application.properties +++ b/src/application/src/main/resources/application.properties @@ -1 +1 @@ -service.message=it is friday +service.message=it is tuesday