diff options
-rw-r--r-- | jjb/cli/cli.yaml | 10 | ||||
-rw-r--r-- | jjb/dmaap/dmaap-datarouter.yaml | 23 | ||||
-rw-r--r-- | jjb/doc/doc-templates-rtd.yaml | 25 | ||||
-rw-r--r-- | jjb/global-macros.yaml | 10 | ||||
-rw-r--r-- | jjb/global-templates-java.yaml | 3 | ||||
-rw-r--r-- | jjb/include-docker-push.sh | 43 | ||||
-rw-r--r-- | jjb/policy/policy-engine.yaml | 4 | ||||
-rw-r--r-- | jjb/portal/docker-build-deploy.sh | 4 | ||||
-rw-r--r-- | jjb/portal/docker-build-push.sh | 2 | ||||
-rw-r--r-- | jjb/portal/docker-build-release.sh | 2 | ||||
-rw-r--r-- | jjb/vfc/vfc-nfvo-driver-ems-java.yaml | 4 |
11 files changed, 70 insertions, 60 deletions
diff --git a/jjb/cli/cli.yaml b/jjb/cli/cli.yaml index d7685b963..30fe2577e 100644 --- a/jjb/cli/cli.yaml +++ b/jjb/cli/cli.yaml @@ -11,13 +11,9 @@ - '{project-name}-{stream}-stage-site-java': site-pom: 'pom.xml' trigger-job: '{project-name}-{stream}-release-version-java-daily' - - '{project-name}-{stream}-docker-version-java-daily': - docker-pom: 'pom.xml' - mvn-profile: 'docker' - maven-properties: | - skip.docker.build=false - skip.docker.tag=false - skip.docker.push=false + - '{project-name}-{stream}-aai-docker-java-daily': + pom: 'deployment/docker/pom.xml' + mvn-goals: 'docker:build' project: 'cli' stream: diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml index 4589c4f4c..6e8a84602 100644 --- a/jjb/dmaap/dmaap-datarouter.yaml +++ b/jjb/dmaap/dmaap-datarouter.yaml @@ -2,22 +2,21 @@ - project: name: dmaap-datarouter project-name: 'dmaap-datarouter' + jobs: + - '{project-name}-{stream}-clm' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-version-java-daily' + - '{project-name}-{stream}-stage-site-java': + site-pom: 'dmaap/datarouter/pom.xml' + trigger-job: '{project-name}-{stream}-release-version-java-daily' + mvn-goals: 'clean install' project: 'dmaap/datarouter' stream: - 'master': branch: 'master' + - 'release-1.0.0': + branch: 'release-1.0.0' mvn-settings: 'dmaap-datarouter-settings' - subproject: - - 'datarouter-prov': - pom: 'datarouter-prov/pom.xml' - pattern: 'datarouter-prov/**' - mvn-goals: 'clean install' - - 'datarouter-node': - pom: 'datarouter-node/pom.xml' - pattern: 'datarouter-node/**' - mvn-goals: 'clean install' - jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' files: '**' archive-artifacts: ''
\ No newline at end of file diff --git a/jjb/doc/doc-templates-rtd.yaml b/jjb/doc/doc-templates-rtd.yaml index c1f6159d1..c6bec58ec 100644 --- a/jjb/doc/doc-templates-rtd.yaml +++ b/jjb/doc/doc-templates-rtd.yaml @@ -31,10 +31,17 @@ maven-version: '{maven-version}' scm: - - gerrit-trigger-scm: + - git: + credentials-id: '{jenkins-ssh-credential}' + url: '$GIT_BASE' refspec: '' - choosing-strategy: 'gerrit' - submodule-recursive: '{submodule-recursive}' + choosing-strategy: 'default' + branches: + - 'refs/heads/{branch}' + skip-tag: true + wipe-workspace: true + submodule: + recursive: '{submodule-recursive}' wrappers: - infra-wrappers: @@ -103,13 +110,19 @@ - maven-exec: maven-version: '{maven-version}' - scm: - - gerrit-trigger-scm: + - git: + credentials-id: '{jenkins-ssh-credential}' + url: '$GIT_BASE' refspec: '' - choosing-strategy: 'gerrit' + choosing-strategy: 'default' + branches: + - 'refs/heads/{branch}' + skip-tag: true + wipe-workspace: true submodule-recursive: '{submodule-recursive}' + wrappers: - infra-wrappers: build-timeout: '{build-timeout}' 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/include-docker-push.sh b/jjb/include-docker-push.sh index 57a0264bb..1a89fe72c 100644 --- a/jjb/include-docker-push.sh +++ b/jjb/include-docker-push.sh @@ -20,40 +20,31 @@ 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 - - docker push $REPO_PATH:$STAGING_TAG; - docker push $REPO_PATH:$SNAPSHOT_TAG; +if [ ! -z "$DOCKER_IMAGE_NAME" ]; then + REPO_PATH=$DOCKER_REPOSITORY/${$DOCKER_IMAGE_NAME}; +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/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/portal/docker-build-deploy.sh b/jjb/portal/docker-build-deploy.sh index dd114af76..5e211fefc 100644 --- a/jjb/portal/docker-build-deploy.sh +++ b/jjb/portal/docker-build-deploy.sh @@ -3,5 +3,5 @@ echo $CURRENTDIR ls -ltr cd deliveries ls -ltr -chmod 755 *.* -./run.sh +chmod 755 *.sh +./build_portalapps_dockers.sh diff --git a/jjb/portal/docker-build-push.sh b/jjb/portal/docker-build-push.sh index c3851dd48..d05190c26 100644 --- a/jjb/portal/docker-build-push.sh +++ b/jjb/portal/docker-build-push.sh @@ -3,5 +3,5 @@ echo $CURRENTDIR ls -ltr cd deliveries ls -ltr -chmod 755 *.* +chmod 755 *.sh ./os_docker_push.sh diff --git a/jjb/portal/docker-build-release.sh b/jjb/portal/docker-build-release.sh index 89a5fc131..0bbd2c8e4 100644 --- a/jjb/portal/docker-build-release.sh +++ b/jjb/portal/docker-build-release.sh @@ -3,5 +3,5 @@ echo $CURRENTDIR ls -ltr cd deliveries ls -ltr -chmod 755 *.* +chmod 755 *.sh ./os_docker_release.sh diff --git a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml index 8c38d48d2..2cdee9b39 100644 --- a/jjb/vfc/vfc-nfvo-driver-ems-java.yaml +++ b/jjb/vfc/vfc-nfvo-driver-ems-java.yaml @@ -10,8 +10,8 @@ mvn-settings: 'vfc-nfvo-driver-ems-settings'
subproject:
- 'drv-ems-boco':
- pom: 'ems/boco/pom.xml'
- pattern: 'ems/boco/**'
+ pom: 'ems/pom.xml'
+ pattern: 'ems/**'
jobs:
- '{project-name}-{stream}-{subproject}-verify-java'
- '{project-name}-{stream}-{subproject}-merge-java'
|