diff --git a/jobs-dsl/jobs/Cloud/Deploy/Backend/msg_files_deploy.groovy b/jobs-dsl/jobs/Cloud/Deploy/Backend/msg_files_deploy.groovy index e4ad6b9..b863eba 100644 --- a/jobs-dsl/jobs/Cloud/Deploy/Backend/msg_files_deploy.groovy +++ b/jobs-dsl/jobs/Cloud/Deploy/Backend/msg_files_deploy.groovy @@ -7,7 +7,7 @@ pipelineJob('Cloud/Deploy/Backend/msg-files-deploy') { parameters { choice { name('ENV') - choices(['DEV']) + choices(['DEV', 'TEST']) description('Select one of environments') } choiceParameter { diff --git a/pipelines/Cloud/Apps-Backend/avroid-service-lib.groovy b/pipelines/Cloud/Apps-Backend/avroid-service-lib.groovy index f29bfcf..0454d7c 100644 --- a/pipelines/Cloud/Apps-Backend/avroid-service-lib.groovy +++ b/pipelines/Cloud/Apps-Backend/avroid-service-lib.groovy @@ -52,6 +52,7 @@ slaveTemplates.jnlp { if (env.TAG_NAME) { print "Upload from tag ${env.TAG_NAME}" + currentBuild.description = env.TAG_NAME dir(localArtifactDir){ String artifacts = sh( diff --git a/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy b/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy index b97eb4b..604b152 100644 --- a/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy +++ b/pipelines/Cloud/Apps-Backend/msg-messenger-core-api.groovy @@ -69,7 +69,10 @@ slaveTemplates.jnlp { Map props = readTOML file: projectSettingFile String version = props.tool.poetry.version + tag = "${version}-${gitVars.GIT_COMMIT.take(5)}" + currentBuild.description = tag + String imageName = "${env.JENKINS_DOCKER_REGISTRY}/" + "${dockerGroup}/${dockerProject}:${tag}" diff --git a/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-dialogs.groovy b/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-dialogs.groovy index 3b6df67..3de5164 100644 --- a/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-dialogs.groovy +++ b/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-dialogs.groovy @@ -45,6 +45,7 @@ slaveTemplates.jnlp { stage('build and push image'){ appVersion = readJSON(file: 'package.json').version imageTag = "${appVersion}-${gitVars.GIT_COMMIT.take(5)}" + currentBuild.description = imageTag docker.withRegistry("https://${env.JENKINS_DOCKER_REGISTRY}", env.JENKINS_HARBOR_CREDENTIALS) { Object buildImage = docker.build( diff --git a/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-host.groovy b/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-host.groovy index 81058fa..19a5f3f 100644 --- a/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-host.groovy +++ b/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-host.groovy @@ -45,6 +45,7 @@ slaveTemplates.jnlp { stage('build and push image'){ appVersion = readJSON(file: 'package.json').version imageTag = "${appVersion}-${gitVars.GIT_COMMIT.take(5)}" + currentBuild.description = imageTag docker.withRegistry("https://${env.JENKINS_DOCKER_REGISTRY}", env.JENKINS_HARBOR_CREDENTIALS) { Object buildImage = docker.build( diff --git a/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-users.groovy b/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-users.groovy index b8f6f90..9836f02 100644 --- a/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-users.groovy +++ b/pipelines/Cloud/Apps-Frontend/web-cloud-messenger-users.groovy @@ -45,6 +45,7 @@ slaveTemplates.jnlp { stage('build and push image'){ appVersion = readJSON(file: 'package.json').version imageTag = "${appVersion}-${gitVars.GIT_COMMIT.take(5)}" + currentBuild.description = imageTag docker.withRegistry("https://${env.JENKINS_DOCKER_REGISTRY}", env.JENKINS_HARBOR_CREDENTIALS) { Object buildImage = docker.build( diff --git a/pipelines/Cloud/Deploy/Backend/msg-files-deploy.groovy b/pipelines/Cloud/Deploy/Backend/msg-files-deploy.groovy index 3e37576..9218f0b 100644 --- a/pipelines/Cloud/Deploy/Backend/msg-files-deploy.groovy +++ b/pipelines/Cloud/Deploy/Backend/msg-files-deploy.groovy @@ -10,7 +10,7 @@ String repositoryName = 'msg-files' // Replace with your Harbor repository name String k8sAppName = repositoryName Map envBranch = [ 'DEV': 'develop', - // 'TEST': 'test' + 'TEST': 'test' ] String apiUrl = "https://${JENKINS_DOCKER_REGISTRY}/api/v2.0/projects/${projectName}" + @@ -105,6 +105,7 @@ slaveTemplates.jnlp { --install ${k8sAppName} ${helmRepoPath} \ --wait """ + currentBuild.description = "ENV: ${params.ENV} TAG: ${env.APP_VERSION}" } } } diff --git a/pipelines/Cloud/Deploy/Backend/msg-messenger-core-api-deploy.groovy b/pipelines/Cloud/Deploy/Backend/msg-messenger-core-api-deploy.groovy index 65d2007..d6b0953 100644 --- a/pipelines/Cloud/Deploy/Backend/msg-messenger-core-api-deploy.groovy +++ b/pipelines/Cloud/Deploy/Backend/msg-messenger-core-api-deploy.groovy @@ -108,6 +108,7 @@ slaveTemplates.jnlp { --install ${k8sAppName} ${helmRepoPath} \ --wait """ + currentBuild.description = "ENV: ${params.ENV} TAG: ${env.APP_VERSION}" } } }