diff options
| -rw-r--r-- | jjb/cli/cli.yaml | 1 | ||||
| -rw-r--r-- | jjb/global-macros.yaml | 10 | ||||
| -rw-r--r-- | jjb/global-templates-java.yaml | 3 | ||||
| -rw-r--r-- | jjb/holmes/holmes-rule-mgt.yaml | 3 | ||||
| -rwxr-xr-x[-rw-r--r--] | jjb/include-docker-push.sh | 44 | ||||
| -rw-r--r-- | jjb/multicloud/multicloud-openstack.yaml | 20 | ||||
| -rw-r--r-- | jjb/policy/policy-engine.yaml | 4 | ||||
| -rw-r--r-- | jjb/ui/ui-dmaapbc.yaml | 2 | ||||
| -rw-r--r-- | jjb/vfc/vfc-nfvo-driver-ems-java.yaml | 1 |
9 files changed, 60 insertions, 28 deletions
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index 30fe2577e..896198f5e 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -14,6 +14,7 @@ - '{project-name}-{stream}-aai-docker-java-daily': pom: 'deployment/docker/pom.xml' mvn-goals: 'docker:build' + docker-image-name: 'onap/cli' project: 'cli' stream: diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 454d056ef..826b6041d 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -109,6 +109,16 @@ # yamllint enable description: 'Maven selector to be used by shell scripts' +- parameter: + name: docker-image-name + parameters: + - string: + name: DOCKER_IMAGE_NAME + # yamllint disable rule:line-length + default: '{docker-image-name}' + # yamllint enable + description: 'Docker image name, e.g. onap/appc' + # PROPERTIES - property: name: infra-properties diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index 21a227b27..23d74c6bc 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -1342,6 +1342,7 @@ name: '{project-name}-{stream}-aai-docker-java-daily' project-type: freestyle node: 'ubuntu1604-docker-8c-8g' + docker-image-name: '' properties: - infra-properties: @@ -1355,6 +1356,8 @@ artifacts: '{archive-artifacts}' - maven-exec: maven-version: '{maven-version}' + - docker-image-name: + docker-image-name: '{docker-image-name}' scm: - gerrit-trigger-scm: diff --git a/jjb/holmes/holmes-rule-mgt.yaml b/jjb/holmes/holmes-rule-mgt.yaml index cf4b5e0e1..069c04779 100644 --- a/jjb/holmes/holmes-rule-mgt.yaml +++ b/jjb/holmes/holmes-rule-mgt.yaml @@ -7,6 +7,7 @@ - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-docker-java-daily' project: 'holmes/rule-management' stream: @@ -15,4 +16,6 @@ mvn-settings: 'holmes-rule-management-settings' files: '**' archive-artifacts: '' + docker-pom: 'pom.xml' + mvn-profile: docker build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/include-docker-push.sh b/jjb/include-docker-push.sh index 57a0264bb..df42fa7b9 100644..100755 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -20,40 +20,34 @@ RELEASE_VERSION_REGEX="^[0-9]+\.[0-9]+\.[0-9]+$"; SNAPSHOT_TAG=${VERSION}-SNAPSHOT-${DATETIME_STAMP}; STAGING_TAG=${VERSION}-STAGING-${DATETIME_STAMP}; -if [[ $PROJECT =~ $SEARCH ]] ; then - REPO_PATH=$DOCKER_REPOSITORY/openecomp/ajsc-aai; - - docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG; - docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG; +# Set REPO_PATH variable - if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then - STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2); - docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - else - docker push $REPO_PATH:latest; - fi +if [ ! -z "$DOCKER_IMAGE_NAME" ]; then + REPO_PATH=$DOCKER_REPOSITORY/${DOCKER_IMAGE_NAME}; - docker push $REPO_PATH:$STAGING_TAG; - docker push $REPO_PATH:$SNAPSHOT_TAG; + # tag image with nexus3 proxy prefix + docker tag ${DOCKER_IMAGE_NAME} $REPO_PATH +elif [[ $PROJECT =~ $SEARCH ]] ; then + REPO_PATH=$DOCKER_REPOSITORY/openecomp/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}; +fi - docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG; - docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG; - if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then - STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2); - docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; - else - docker push $REPO_PATH:latest; - fi +docker tag $REPO_PATH:latest $REPO_PATH:$STAGING_TAG; +docker tag $REPO_PATH:latest $REPO_PATH:$SNAPSHOT_TAG; - docker push $REPO_PATH:$SNAPSHOT_TAG; - docker push $REPO_PATH:$STAGING_TAG; +if [[ "$VERSION" =~ $RELEASE_VERSION_REGEX ]]; then + STRIPPED_RELEASE=$(echo $VERSION | cut -d"." -f1,2); + docker tag $REPO_PATH:latest $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; + docker push $REPO_PATH:${STRIPPED_RELEASE}-STAGING-latest; +else + docker push $REPO_PATH:latest; fi + +docker push $REPO_PATH:$SNAPSHOT_TAG; +docker push $REPO_PATH:$STAGING_TAG; diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml new file mode 100644 index 000000000..e60c9c6d6 --- /dev/null +++ b/jjb/multicloud/multicloud-openstack.yaml @@ -0,0 +1,20 @@ +--- +- project: + name: multicloud-openstack + project-name: 'multicloud-openstack' + project: 'multicloud/openstack' + stream: + - 'master': + branch: 'master' + mvn-settings: 'multicloud-openstack-settings' + subproject: + - 'openstack': + path: '.' + pattern: '**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + files: '**' + archive-artifacts: '' + build-node: 'ubuntu1604-basebuild-4c-4g' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml index e657192b4..8ee95e674 100644 --- a/jjb/policy/policy-engine.yaml +++ b/jjb/policy/policy-engine.yaml @@ -4,13 +4,10 @@ project-name: 'policy-engine' jobs: - '{project-name}-{stream}-clm': - build-node: 'ubuntu1604-basebuild-4c-4g' - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' - '{project-name}-{stream}-release-version-java-daily': - build-node: 'ubuntu1604-basebuild-4c-4g' - '{project-name}-{stream}-stage-site-java': - build-node: 'ubuntu1604-basebuild-4c-4g' site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' @@ -21,6 +18,7 @@ mvn-settings: 'policy-engine-settings' files: '**' archive-artifacts: '' + build-node: 'ubuntu1604-basebuild-4c-4g' - project: name: policy-engine-release-1.0.0 project-name: 'policy-engine' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 022ee6b9a..c56617849 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -18,6 +18,8 @@ branch: 'master' - 'release-1.0.0': branch: 'release-1.0.0' + - 'release-1.1.0': + branch: 'release-1.1.0' mvn-settings: 'ui-dmaapbc-settings' files: '**' archive-artifacts: '' diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 2cdee9b39..ef5518732 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -15,6 +15,7 @@ jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
+ - '{project-name}-{stream}-{subproject}-release-java-daily'
files: '**'
archive-artifacts: ''
build-node: ubuntu1604-basebuild-4c-4g
\ No newline at end of file |