diff options
Diffstat (limited to 'jjb')
| -rw-r--r-- | jjb/aaf/aaf-authz-docker.yaml | 1 | ||||
| -rw-r--r-- | jjb/clamp/clamp.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 16 | ||||
| -rwxr-xr-x | jjb/include-docker-push.sh | 4 | ||||
| -rw-r--r-- | jjb/vid/vid-csit.yaml | 2 |
5 files changed, 21 insertions, 3 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml index 332885697..754fbddd3 100644 --- a/jjb/aaf/aaf-authz-docker.yaml +++ b/jjb/aaf/aaf-authz-docker.yaml @@ -18,6 +18,7 @@ - skipDockerTag=true - skipDockerPush=true - '{project-name}-{stream}-docker-java-properties-daily': + setVersion: 'DontSetVersion' docker-pom: 'authz-service/pom.xml' mvn-profile: 'docker' maven-properties: | diff --git a/jjb/clamp/clamp.yaml b/jjb/clamp/clamp.yaml index da9bc2548..746caa0ea 100644 --- a/jjb/clamp/clamp.yaml +++ b/jjb/clamp/clamp.yaml @@ -16,6 +16,7 @@ - skipDockerTag=true - skipDockerPush=true - '{project-name}-{stream}-docker-java-properties-daily': + setVersion: 'DoSetVersion' docker-pom: 'pom.xml' mvn-profile: 'docker' maven-properties: | diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index be02418eb..e31a470df 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1458,6 +1458,22 @@ - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - conditional-step: + condition-kind: regex-match + regex: DoSetVersion + label: '{setVersion}' + steps: + - inject: + properties-file: version.properties + - maven-target: + maven-version: '{maven-version}' + goals: 'versions:set versions:update-child-modules versions:commit -B' + properties: + - 'newVersion=${{release_version}}' + settings: '{mvn-settings}' + settings-type: cfp + global-settings: 'global-settings' + global-settings-type: cfp - docker-login - maven-docker-push-daily: maven-version: '{maven-version}' diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh index df42fa7b9..c0394de81 100755 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -29,12 +29,12 @@ if [ ! -z "$DOCKER_IMAGE_NAME" ]; then # tag image with nexus3 proxy prefix docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH elif [[ $PROJECT =~ $SEARCH ]] ; then - REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai; + REPO_PATH=$DOCKER_REPOSITORY/onap/ajsc-aai; else # Cut the prefix aai/ in example aai/model-loader DOCKER_REPO_NAME=$(echo ${PROJECT} | cut -d"/" -f2-); - REPO_PATH=$DOCKER_REPOSITORY/openecomp/${DOCKER_REPO_NAME}; + REPO_PATH=$DOCKER_REPOSITORY/onap/${DOCKER_REPO_NAME}; fi diff --git a/jjb/vid/vid-csit.yaml b/jjb/vid/vid-csit.yaml index 46e1688ed..b1124ab70 100644 --- a/jjb/vid/vid-csit.yaml +++ b/jjb/vid/vid-csit.yaml @@ -9,6 +9,6 @@ functionality: - 'healthCheck': trigger_jobs: - - '{project-name}-{stream}-release-java-daily-checkstyle' + - '{project-name}-{stream}-docker-version-java-daily' robot-options: '' branch: 'master' |