summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aaf/aaf-authz-docker.yaml2
-rw-r--r--jjb/aaf/aaf-authz.yaml1
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml4
-rw-r--r--jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml4
-rw-r--r--jjb/global-templates-java.yaml79
-rw-r--r--jjb/multicloud/build-multicloud-openstack-docker-image.sh10
-rw-r--r--jjb/multicloud/multicloud-openstack.yaml4
-rw-r--r--jjb/sdnc/sdnc-csit.yaml14
8 files changed, 112 insertions, 6 deletions
diff --git a/jjb/aaf/aaf-authz-docker.yaml b/jjb/aaf/aaf-authz-docker.yaml
index 35d9fe876..d3e75b478 100644
--- a/jjb/aaf/aaf-authz-docker.yaml
+++ b/jjb/aaf/aaf-authz-docker.yaml
@@ -16,7 +16,7 @@
- skipDockerTag=true
- skipDockerPush=true
- '{project-name}-{stream}-docker-java-properties-daily':
- docker-pom: 'pom.xml'
+ docker-pom: 'authz-service/pom.xml'
mvn-profile: 'docker'
maven-properties: |
skip.docker.build=false
diff --git a/jjb/aaf/aaf-authz.yaml b/jjb/aaf/aaf-authz.yaml
index 8baea68b8..f2c7860c5 100644
--- a/jjb/aaf/aaf-authz.yaml
+++ b/jjb/aaf/aaf-authz.yaml
@@ -12,7 +12,6 @@
- '{project-name}-{stream}-stage-site-java':
site-pom: 'pom.xml'
trigger-job: '{project-name}-{stream}-release-version-java-daily'
- mvn-goals: 'clean install'
- '{project-name}-{stream}-docker-version-java-daily':
mvn-goals: 'docker:build'
project: 'aaf/authz'
diff --git a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
index bce4863a1..14a67224d 100644
--- a/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-inventory-api.yaml
@@ -6,6 +6,10 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily'
+ - '{project-name}-{stream}-docker-java-shell-daily':
+ mvn-goals: 'clean package docker:build -DpushImage'
+ # No-op
+ script: '/bin/true'
project: 'dcaegen2/platform/inventory-api'
stream:
diff --git a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
index ea6c4c562..1ec9e9580 100644
--- a/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
+++ b/jjb/dcaegen2/dcaegen2-platform-servicechange-handler.yaml
@@ -6,6 +6,10 @@
- '{project-name}-{stream}-verify-java'
- '{project-name}-{stream}-merge-java'
- '{project-name}-{stream}-release-version-java-daily-no-sonar'
+ - '{project-name}-{stream}-docker-java-shell-daily':
+ mvn-goals: 'clean package docker:build -DpushImage'
+ # No-op
+ script: '/bin/true'
project: 'dcaegen2/platform/servicechange-handler'
stream:
diff --git a/jjb/global-templates-java.yaml b/jjb/global-templates-java.yaml
index 23d74c6bc..a3f0a7655 100644
--- a/jjb/global-templates-java.yaml
+++ b/jjb/global-templates-java.yaml
@@ -572,6 +572,85 @@
#
# The purpose of this job template is to run "maven version && maven clean
# deploy" for projects using this template.
+ # This template supports subprojects.
+ #
+ # Required Variables:
+ # branch: git branch (eg. stable/lithium or master)
+ name: '{project-name}-{stream}-{subproject}-release-version-java-daily-no-sonar'
+
+ project-type: freestyle
+ node: '{build-node}'
+ maven-deploy-properties:
+ properties:
+ - infra-properties:
+ build-days-to-keep: '{build-days-to-keep}'
+
+ parameters:
+ - infra-parameters:
+ project: '{project}'
+ branch: '{branch}'
+ refspec: 'refs/heads/{branch}'
+ artifacts: '{archive-artifacts}'
+ - maven-exec:
+ maven-version: '{maven-version}'
+
+ scm:
+ - gerrit-trigger-scm:
+ refspec: ''
+ choosing-strategy: 'default'
+ submodule-recursive: '{submodule-recursive}'
+
+ wrappers:
+ - infra-wrappers:
+ build-timeout: '{build-timeout}'
+
+ triggers:
+ # 11 AM UTC
+ - timed: 'H 11 * * *'
+ - gerrit-trigger-release-manually:
+ server: '{server-name}'
+ project: '{project}'
+ branch: '{branch}'
+
+ builders:
+ - provide-maven-settings:
+ global-settings-file: 'global-settings'
+ settings-file: '{mvn-settings}'
+
+ - inject:
+ properties-file: version.properties
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ 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
+
+ - maven-target:
+ maven-version: '{maven-version}'
+ pom: '{pom}'
+ goals: 'clean deploy -B
+ -Dorg.slf4j.simpleLogger.log.org.apache.maven.cli.transfer.Slf4jMavenTransferListener=warn'
+ properties:
+ - '{maven-deploy-properties}'
+ settings: '{mvn-settings}'
+ settings-type: cfp
+ global-settings: 'global-settings'
+ global-settings-type: cfp
+
+ publishers:
+ - infra-shiplogs:
+ maven-version: '{maven-version}'
+
+- job-template:
+ # Job template for Java daily release jobs
+ #
+ # The purpose of this job template is to run "maven version && maven clean
+ # deploy" for projects using this template.
#
# Required Variables:
# branch: git branch (eg. stable/lithium or master)
diff --git a/jjb/multicloud/build-multicloud-openstack-docker-image.sh b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
index 671f65f7c..10e1df938 100644
--- a/jjb/multicloud/build-multicloud-openstack-docker-image.sh
+++ b/jjb/multicloud/build-multicloud-openstack-docker-image.sh
@@ -5,8 +5,10 @@ echo '============== CALLING SCRIPT TO BUILD DOCKER IMAGES ================='
CURRENTDIR="$(pwd)"
echo $CURRENTDIR
-chmod 755 ./openstack/newton/docker/*.*
-chmod 755 ./openstack/ocata/docker/*.*
+chmod 755 ./newton/docker/*.*
+chmod 755 ./ocata/docker/*.*
+chmod 755 ./windriver/docker/*.*
-./openstack/newton/docker/build_image.sh
-./openstack/ocata/docker/build_image.sh
+./newton/docker/build_image.sh
+./ocata/docker/build_image.sh
+./windriver/docker/build_image.sh
diff --git a/jjb/multicloud/multicloud-openstack.yaml b/jjb/multicloud/multicloud-openstack.yaml
index 84404e3be..94ac2ab84 100644
--- a/jjb/multicloud/multicloud-openstack.yaml
+++ b/jjb/multicloud/multicloud-openstack.yaml
@@ -16,6 +16,10 @@
path: 'ocata'
pattern: 'ocata/**'
pom: 'ocata/pom.xml'
+ - 'windriver':
+ path: 'windriver'
+ pattern: 'windriver/**'
+ pom: 'windriver/pom.xml'
jobs:
- '{project-name}-{stream}-{subproject}-verify-python'
- '{project-name}-{stream}-{subproject}-verify-java'
diff --git a/jjb/sdnc/sdnc-csit.yaml b/jjb/sdnc/sdnc-csit.yaml
new file mode 100644
index 000000000..1cd1eb94a
--- /dev/null
+++ b/jjb/sdnc/sdnc-csit.yaml
@@ -0,0 +1,14 @@
+---
+- project:
+ name: sdnc-csit
+ jobs:
+ - '{project-name}-{stream}-verify-csit-{functionality}'
+ - '{project-name}-{stream}-csit-{functionality}'
+ project-name: 'sdnc'
+ stream: 'master'
+ functionality:
+ - 'healthcheck':
+ trigger_jobs:
+ - '{project-name}-{stream}-release-java-daily-checkstyle'
+ robot-options: ''
+ branch: 'master'