diff options
Diffstat (limited to 'jjb')
-rw-r--r-- | jjb/ci-management/ci-management.yaml | 4 | ||||
-rw-r--r-- | jjb/dcae/include-raw-pgaas.sh | 33 | ||||
-rw-r--r-- | jjb/dcae/pgaas.yaml | 32 | ||||
-rw-r--r-- | jjb/global-macros.yaml | 5 | ||||
-rw-r--r-- | jjb/global-templates-java.yaml | 5 | ||||
-rw-r--r-- | jjb/include-docker-login.sh | 26 | ||||
-rw-r--r-- | jjb/ncomp/ncomp-maven.yaml | 21 | ||||
-rw-r--r-- | jjb/policy/policy-common.yaml (renamed from jjb/sdc/sdc_distribution_client.yaml) | 10 | ||||
-rw-r--r-- | jjb/policy/policy-drools-applications.yaml | 16 | ||||
-rw-r--r-- | jjb/policy/policy-drools-pdp.yaml | 16 | ||||
-rw-r--r-- | jjb/policy/policy-engine.yaml | 16 | ||||
-rw-r--r-- | jjb/portal/portal.yaml | 8 | ||||
-rw-r--r-- | jjb/sdc/sdc-sdc-distribution-client.yaml | 16 | ||||
-rw-r--r-- | jjb/testsuite/testsuite-heatbridge.yaml | 18 | ||||
-rw-r--r-- | jjb/ui/ui-dmaapbc.yaml | 14 |
15 files changed, 214 insertions, 26 deletions
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml index 8a6d7e473..662e9c542 100644 --- a/jjb/ci-management/ci-management.yaml +++ b/jjb/ci-management/ci-management.yaml @@ -22,8 +22,8 @@ - docker exclude: - # only build the docker image on centos at present - - platforms: ubuntu-16.04 + # only build the docker image on ubuntu at present + - platforms: centos templates: docker - job-template: diff --git a/jjb/dcae/include-raw-pgaas.sh b/jjb/dcae/include-raw-pgaas.sh new file mode 100644 index 000000000..cded4b1e6 --- /dev/null +++ b/jjb/dcae/include-raw-pgaas.sh @@ -0,0 +1,33 @@ +#!/bin/bash +# Create a debian package and push to remote repo +# +echo "============== STARTING SCRIPT TO CREATE DEBIAN FILES =================" + +export BUILD_NUMBER="${BUILD_ID}" +export PATH=$PATH:${WORKSPACE}/buildtools/bin + +#export OPENECOMP_NEXUS_RAW="https://nexus.openecomp.org/content/sites/raw" +export OPENECOMP_NEXUS_RAW="${NEXUSPROXY}/content/sites/raw" +export OPENECOMP_NEXUS_USER=$(xpath -q -e \ + "//servers/server[id='ecomp-raw']/username/text()" "$SETTINGS_FILE") +export OPENECOMP_NEXUS_PASSWORD=$(xpath -q -e \ + "//servers/server[id='ecomp-raw']/password/text()" "$SETTINGS_FILE") + +echo $OPENECOMP_NEXUS_RAW +echo $OPENECOMP_NEXUS_USER +echo $OPENECOMP_NEXUS_PASSWORD + +export REPACKAGEDEBIANUPLOAD="set -x; curl -k \ + --user ${OPENECOMP_NEXUS_USER}:${OPENECOMP_NEXUS_PASSWORD}' \ + --upload-file '{0}' \ + '${OPENECOMP_NEXUS_RAW}/org.openecomp.dcae/deb-snapshots/{2}/{1}'" +export REPACKAGEDEBIANUPLOAD2="set -x; curl -k \ + --user '${OPENECOMP_NEXUS_USER}:${OPENECOMP_NEXUS_PASSWORD}' \ + --upload-file '{0}' \ + '${OPENECOMP_NEXUS_RAW}/org.openecomp.dcae/deb-snapshots/{2}/{4}-LATEST.deb'" +make debian +echo "================= ENDING SCRIPT TO CREATE DEBIAN FILES =================" + +#echo "============= STARTING SCRIPT TO CREATE JAVADOCS FILES ================" +#make upload-javadocs +#echo "============= ENDING SCRIPT TO CREATE JAVADOCS FILES ==================" diff --git a/jjb/dcae/pgaas.yaml b/jjb/dcae/pgaas.yaml new file mode 100644 index 000000000..751ccfc24 --- /dev/null +++ b/jjb/dcae/pgaas.yaml @@ -0,0 +1,32 @@ +--- + +- project: + name: dcae-pgaas + project-name: 'dcae-pgaas' + jobs: + - '{project-name}-{stream}-multi-scm-verify-script' + + + # script: build script to execute + # extra-project: extra gerrit project to checkout + # extra-refspec: refspec for the extra project + # extra-branch: branch to checkout for the extra project + # checkout-dir: directory to checkout the extra project to + # DO NOT SET THIS TO anything that translates to + # $WORKSPACE as it will destroy the initial + # project checkout + + project: 'dcae/pgaas' + stream: + - 'master': + branch: 'master' + mvn-settings: 'dcae-pgaas-settings' + files: '**' + archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g + extra-project: 'dcae/utils/buildtools' + extra-branch: 'master' + extra-refspec: 'refs/heads/{branch}' + checkout-dir: 'buildtools' + script: + !include-raw-escape: 'include-raw-pgaas.sh' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 43f52f46c..5815ccf53 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -52,6 +52,11 @@ - docker.pull.registry=nexus3.openecomp.org:10001 - docker.push.registry=nexus3.openecomp.org:10003 +- builder: + name: docker-login + builders: + - shell: !include-raw: include-docker-login.sh + # PARAMETERS - parameter: name: ecomp-infra-parameters diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml index a9a368ee2..af595b3b9 100644 --- a/jjb/global-templates-java.yaml +++ b/jjb/global-templates-java.yaml @@ -307,7 +307,7 @@ - job-template: name: '{project-name}-{stream}-docker-java-daily' project-type: freestyle - node: 'centos7-docker-8c-8g' + node: 'ubuntu1604-docker-8c-8g' properties: - ecomp-infra-properties: @@ -334,10 +334,13 @@ - timed: 'H 12 * * *' builders: + - provide-maven-settings: global-settings-file: 'global-settings' settings-file: '{mvn-settings}' + - docker-login + - maven-docker-push-daily: mvn-settings: '{mvn-settings}' pom: '{docker-pom}' diff --git a/jjb/include-docker-login.sh b/jjb/include-docker-login.sh new file mode 100644 index 000000000..3b677b46d --- /dev/null +++ b/jjb/include-docker-login.sh @@ -0,0 +1,26 @@ +#!/bin/bash + +DOCKER_REPOSITORIES="nexus3.openecomp.org:10001 \ + nexus3.openecomp.org:10002 \ + nexus3.openecomp.org:10003" + +for DOCKER_REPOSITORY in $DOCKER_REPOSITORIES; +do + echo $DOCKER_REPOSITORY + USER=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/username/text()" "$SETTINGS_FILE") + PASS=$(xpath -e "//servers/server[id='$DOCKER_REPOSITORY']/password/text()" "$SETTINGS_FILE") + + if [ -z "$USER" ]; + then + echo "Error: no user provided" + fi + + if [ -z "$PASS" ]; + then + echo "Error: no password provided" + fi + + [ -z "$PASS" ] && PASS_PROVIDED="<empty>" || PASS_PROVIDED="<password>" + echo docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS_PROVIDED" + docker login $DOCKER_REPOSITORY -u "$USER" -p "$PASS" +done diff --git a/jjb/ncomp/ncomp-maven.yaml b/jjb/ncomp/ncomp-maven.yaml new file mode 100644 index 000000000..9a1d2ad62 --- /dev/null +++ b/jjb/ncomp/ncomp-maven.yaml @@ -0,0 +1,21 @@ +--- +- project: + name: ncomp-maven + project-name: 'ncomp-maven' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'ncomp/maven' + stream: + - 'master': + branch: 'master' + mvn-settings: 'ncomp-settings' + # due to a strange macro / variable translation problem this needs to be + # passed as a string block to properly get the properties correctly defined + # in the job + maven-deploy-properties: | + deployAtEnd=true + files: '**' + archive-artifacts: '' diff --git a/jjb/sdc/sdc_distribution_client.yaml b/jjb/policy/policy-common.yaml index 3425ddd0c..ac5d92186 100644 --- a/jjb/sdc/sdc_distribution_client.yaml +++ b/jjb/policy/policy-common.yaml @@ -1,16 +1,16 @@ --- - - project: - name: sdc_distribution_client - project-name: 'sdc_distribution_client' + name: policy-common + project-name: 'policy-common' jobs: - '{project-name}-{stream}-verify-java' - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' - project: 'sdc_distribution_client' + project: 'policy/common' stream: - 'master': branch: 'master' - mvn-settings: 'sdc_distribution_client-settings' + mvn-settings: 'policy-common-settings' files: '**' archive-artifacts: '' diff --git a/jjb/policy/policy-drools-applications.yaml b/jjb/policy/policy-drools-applications.yaml new file mode 100644 index 000000000..4af3bf217 --- /dev/null +++ b/jjb/policy/policy-drools-applications.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: policy-drools-applications + project-name: 'policy-drools-applications' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'policy/drools-applications' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-drools-applications-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/policy/policy-drools-pdp.yaml b/jjb/policy/policy-drools-pdp.yaml new file mode 100644 index 000000000..3ea404a34 --- /dev/null +++ b/jjb/policy/policy-drools-pdp.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: policy-drools-pdp + project-name: 'policy-drools-pdp' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'policy/drools-pdp' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-drools-pdp-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/policy/policy-engine.yaml b/jjb/policy/policy-engine.yaml new file mode 100644 index 000000000..920e7f991 --- /dev/null +++ b/jjb/policy/policy-engine.yaml @@ -0,0 +1,16 @@ +--- +- project: + name: policy-engine + project-name: 'policy-engine' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + - '{project-name}-{stream}-release-java-daily' + + project: 'policy/engine' + stream: + - 'master': + branch: 'master' + mvn-settings: 'policy-engine-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/portal/portal.yaml b/jjb/portal/portal.yaml index 2bb6dc773..09e28ebc7 100644 --- a/jjb/portal/portal.yaml +++ b/jjb/portal/portal.yaml @@ -2,13 +2,8 @@ - project: name: portal project-name: 'portal' - subproject: - - 'ecomp-portal-BE': - pom: 'ecomp-portal-BE/pom.xml' - pattern: 'ecomp-portal-BE/**' jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-verify-java' project: 'portal' stream: @@ -17,3 +12,4 @@ mvn-settings: 'portal-settings' files: '**' archive-artifacts: '' + build-node: ubuntu1604-basebuild-4c-4g diff --git a/jjb/sdc/sdc-sdc-distribution-client.yaml b/jjb/sdc/sdc-sdc-distribution-client.yaml new file mode 100644 index 000000000..0e7ce3657 --- /dev/null +++ b/jjb/sdc/sdc-sdc-distribution-client.yaml @@ -0,0 +1,16 @@ +--- + +- project: + name: sdc-sdc-distribution-client + project-name: 'sdc-sdc-distribution-client' + jobs: + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' + + project: 'sdc/sdc-distribution-client' + stream: + - 'master': + branch: 'master' + mvn-settings: 'sdc-sdc-distribution-client-settings' + files: '**' + archive-artifacts: '' diff --git a/jjb/testsuite/testsuite-heatbridge.yaml b/jjb/testsuite/testsuite-heatbridge.yaml new file mode 100644 index 000000000..2d2f07b03 --- /dev/null +++ b/jjb/testsuite/testsuite-heatbridge.yaml @@ -0,0 +1,18 @@ +--- +- project: + name: testsuite-heatbridge + project-name: 'testsuite-heatbridge' + subproject: + - heatbridge: + path: '.' + pattern: '**' + jobs: + - '{project-name}-{stream}-{subproject}-verify-python' + + project: 'testsuite/heatbridge' + + stream: + - 'master': + branch: 'master' + + mvn-settings: 'testsuite-heatbridge-settings' diff --git a/jjb/ui/ui-dmaapbc.yaml b/jjb/ui/ui-dmaapbc.yaml index 0863cc118..ab1529e0c 100644 --- a/jjb/ui/ui-dmaapbc.yaml +++ b/jjb/ui/ui-dmaapbc.yaml @@ -2,20 +2,10 @@ - project: name: ui-dmaapbc project-name: 'ui-dmaapbc' - subproject: - - 'dcae_dmaapbc_client': - pom: 'dcae_dmaapbc_client/pom.xml' - pattern: 'dcae_dmaapbc_client/**' - - 'dcae_dmaapbc_model': - pom: 'dcae_dmaapbc_model/pom.xml' - pattern: 'dcae_dmaapbc_model/**' - - 'dcae_dmaapbc_webapp': - pom: 'dcae_dmaapbc_webapp/pom.xml' - pattern: 'dcae_dmaapbc_webapp/**' jobs: - - '{project-name}-{stream}-{subproject}-verify-java' - - '{project-name}-{stream}-{subproject}-merge-java' + - '{project-name}-{stream}-verify-java' + - '{project-name}-{stream}-merge-java' project: 'ui/dmaapbc' stream: |