summaryrefslogtreecommitdiffstats
path: root/jjb
diff options
context:
space:
mode:
Diffstat (limited to 'jjb')
-rw-r--r--jjb/aai/aai-aai-common.yaml10
-rw-r--r--jjb/ci-management/ci-management.yaml2
-rw-r--r--jjb/dmaap/dmaap-buscontroller.yaml4
-rw-r--r--jjb/dmaap/dmaap-datarouter.yaml34
-rw-r--r--jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml4
-rw-r--r--jjb/dmaap/dmaap-messagerouter-messageservice.yaml4
-rw-r--r--jjb/doc/rules.yaml13
-rw-r--r--jjb/global-templates-docker.yaml302
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml4
-rw-r--r--jjb/oom-platform-cert-service/oom-platform-cert-service.yaml4
-rw-r--r--jjb/oom/offline-installer.yaml8
-rw-r--r--jjb/oom/oom-helm.yaml8
-rw-r--r--jjb/oom/oom-main-linter.yaml4
-rw-r--r--jjb/portal-ng-e2e/portal-ng-e2e.yaml15
-rw-r--r--jjb/portal-ng/portal-ng-bff.yaml2
15 files changed, 80 insertions, 338 deletions
diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml
index a068a44c8..280972a68 100644
--- a/jjb/aai/aai-aai-common.yaml
+++ b/jjb/aai/aai-aai-common.yaml
@@ -84,8 +84,8 @@
- project:
name: "aai-aai-common-docker"
jobs:
- - "{project-name}-{stream}-verify-docker"
- - "{project-name}-{stream}-merge-docker"
+ - gerrit-docker-verify
+ - gerrit-docker-merge
- gerrit-maven-docker-stage:
sbom-generator: true
mvn-params: "-P docker -Dmaven.test.skip=true"
@@ -107,9 +107,9 @@
branch: "kohn"
distro: "alpine"
mvn-params: "-P spring-boot-2-1,docker"
- docker_name: "onap/aai-common-{distro}"
- docker_build_args: "-f ./Dockerfile.{distro}"
- docker_root: "$WORKSPACE/Dockerfiles/aai-common/"
+ docker-name: "onap/aai-common-{distro}"
+ docker-build-args: "-f ./Dockerfile.{distro}"
+ docker-root: "$WORKSPACE/Dockerfiles/aai-common/"
mvn-settings: "aai-aai-common-settings"
mvn-version: "mvn35"
files: "Dockerfiles/aai-common/**"
diff --git a/jjb/ci-management/ci-management.yaml b/jjb/ci-management/ci-management.yaml
index 98c063e97..ccb03d755 100644
--- a/jjb/ci-management/ci-management.yaml
+++ b/jjb/ci-management/ci-management.yaml
@@ -32,7 +32,7 @@
branch: "master"
build-timeout: "60"
build-node: "centos8-builder-2c-1g"
- jjb-version: 4.1.0
+ jjb-version: 5.0.2
# configure the gerrit-jjb-verify job
build-node-label-check: true
build-node-label-list: ""
diff --git a/jjb/dmaap/dmaap-buscontroller.yaml b/jjb/dmaap/dmaap-buscontroller.yaml
index 35b88523d..a661b4a1e 100644
--- a/jjb/dmaap/dmaap-buscontroller.yaml
+++ b/jjb/dmaap/dmaap-buscontroller.yaml
@@ -23,8 +23,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
mvn-settings: "dmaap-buscontroller-settings"
files: "**"
archive-artifacts: ""
diff --git a/jjb/dmaap/dmaap-datarouter.yaml b/jjb/dmaap/dmaap-datarouter.yaml
index 304e040ca..b18b85257 100644
--- a/jjb/dmaap/dmaap-datarouter.yaml
+++ b/jjb/dmaap/dmaap-datarouter.yaml
@@ -1,6 +1,30 @@
---
- project:
- name: dmaap-datarouter-java
+ name: dmaap-datarouter-java-11
+ project-name: "dmaap-datarouter"
+ jobs:
+ - "{project-name}-{stream}-verify-java"
+ - "{project-name}-{stream}-merge-java"
+ - gerrit-maven-docker-stage:
+ build-node: ubuntu1804-docker-8c-8g
+ maven-versions-plugin: true
+ mvn-goals: "clean package -P docker docker:build docker:push"
+ container-public-registry: "nexus3.onap.org:10001"
+ container-staging-registry: "nexus3.onap.org:10003"
+ cron: ""
+ - "{project-name}-gerrit-release-jobs":
+ build-node: centos7-docker-2c-1g
+ project: "dmaap/datarouter"
+ stream:
+ - "london":
+ branch: "london"
+ mvn-settings: "dmaap-datarouter-settings"
+ files: "**"
+ archive-artifacts: ""
+ java-version: openjdk11
+
+- project:
+ name: dmaap-datarouter-java-17
project-name: "dmaap-datarouter"
jobs:
- "{project-name}-{stream}-verify-java"
@@ -18,12 +42,10 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
mvn-settings: "dmaap-datarouter-settings"
files: "**"
archive-artifacts: ""
- java-version: openjdk11
+ java-version: openjdk17
- project:
name: dmaap-datarouter-csit-ssl
@@ -58,7 +80,7 @@
mvn-settings: "dmaap-datarouter-settings"
mvn-goals: "clean install"
mvn-opts: "-Xmx1024m -XX:MaxPermSize=256m"
- java-version: openjdk11
+ java-version: openjdk17
- project:
name: dmaap-datarouter-clm
@@ -69,7 +91,7 @@
project-name: "dmaap-datarouter"
branch: "master"
mvn-settings: "dmaap-datarouter-settings"
- java-version: openjdk11
+ java-version: openjdk17
- project:
name: dmaap-datarouter-info
diff --git a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
index 47dff2fba..6eee793d1 100644
--- a/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
@@ -16,8 +16,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
files: "**"
archive-artifacts: ""
diff --git a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
index c700779c7..934b0a84a 100644
--- a/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
+++ b/jjb/dmaap/dmaap-messagerouter-messageservice.yaml
@@ -18,8 +18,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
mvn-settings: "dmaap-messagerouter-messageservice-settings"
java-version: openjdk11
files: "**"
diff --git a/jjb/doc/rules.yaml b/jjb/doc/rules.yaml
index 462bdf0ce..b78c5aa46 100644
--- a/jjb/doc/rules.yaml
+++ b/jjb/doc/rules.yaml
@@ -38,6 +38,7 @@
exitstatus="0"
warning="0"
# message, begin
+ log_success_msg "INFO doc-rules Version 23-07-07-A"
log_success_msg "INFO Starting additional checks related to documentation."
log_success_msg "INFO See https://git.onap.org/doc/doc-best-practice for example config files (master branch)."
log_success_msg "INFO Modify example config files if you like to use them in a release branch."
@@ -86,14 +87,18 @@
log_warning_msg "WARN sphinx-build option '-W' missing for spellcheck in $filename, line $linenumber."
warning="1"
else
- log_failure_msg "FAIL sphinx-build option '-W' missing in $filename, line $linenumber. Please add it."
- exitstatus="1"
+ log_warning_msg "WARN sphinx-build option '-W' missing in $filename, line $linenumber. Please add it."
+ warning="1"
+ #log_failure_msg "FAIL sphinx-build option '-W' missing in $filename, line $linenumber. Please add it."
+ #exitstatus="1"
fi
fi
done < $filename
if [ "$sphinxbuild_detected" = "0" ]; then
- log_failure_msg "FAIL Sphinx-build command(s) missing in $filename. Please add it."
- exitstatus="1"
+ log_warning_msg "WARN Sphinx-build command(s) missing in $filename. Please add it."
+ warning="1"
+ #log_failure_msg "FAIL Sphinx-build command(s) missing in $filename. Please add it."
+ #exitstatus="1"
fi
# second tox.ini @ root directory
if [ -f ./tox.ini ] ; then
diff --git a/jjb/global-templates-docker.yaml b/jjb/global-templates-docker.yaml
deleted file mode 100644
index a58467468..000000000
--- a/jjb/global-templates-docker.yaml
+++ /dev/null
@@ -1,302 +0,0 @@
----
-###########
-# ANCHORS #
-###########
-- _docker_job_boiler_plate: &docker_job_boiler_plate
- name: docker_job_boiler_plate
-
- project-type: freestyle
- node: "{build-node}"
-
- ######################
- # Default parameters #
- ######################
-
- branch: master
- submodule-recursive: true
-
- # default params for docker jobs
- pre_build_script: ""
- post_build_script: ""
- docker_root: "$WORKSPACE"
- docker_build_args: ""
- docker_name: "unnamed"
- # Default to LF standard 'snapshots' docker registry
- docker_registry: "$DOCKER_REGISTRY:10003"
- docker_tag: "latest"
- submodule-disable: false
- submodule-timeout: 10
-
- #####################
- # Job Configuration #
- #####################
-
- properties:
- - lf-infra-properties:
- build-days-to-keep: "{build-days-to-keep}"
-
- parameters:
- - lf-infra-parameters:
- branch: "{branch}"
- project: "{project}"
- stream: "{stream}"
- lftools-version: "{lftools-version}"
-
- wrappers:
- - lf-infra-wrappers:
- build-timeout: "{build-timeout}"
- jenkins-ssh-credential: "{jenkins-ssh-credential}"
-
- publishers:
- - lf-infra-publish
-
-- _docker_verify_boiler_plate: &docker_verify_boiler_plate
- name: docker_verify_boiler_plate
-
- concurrent: true
-
- scm:
- - gerrit-trigger-scm:
- refspec: "$GERRIT_REFSPEC"
- choosing-strategy: "default"
- submodule-recursive: "{submodule-recursive}"
-
- triggers:
- - gerrit-trigger-patch-submitted:
- status-context: "{project}-Docker-Verify"
- server: "{server-name}"
- project: "{project}"
- branch: "{branch}"
- files: "{files}"
-
-- _docker_merge_boiler_plate: &docker_merge_boiler_plate
- name: docker_merge_boiler_plate
-
- scm:
- - gerrit-trigger-scm:
- refspec: "$GERRIT_REFSPEC"
- choosing-strategy: "default"
- submodule-recursive: "{submodule-recursive}"
-
- triggers:
- - gerrit-trigger-patch-merged:
- server: "{server-name}"
- project: "{project}"
- branch: "{branch}"
- files: "{files}"
- - pollscm:
- cron: ""
-
-#################
-# JOB TEMPLATES #
-#################
-- job-template:
- name: "{project-name}-{stream}-merge-docker"
- # Job template for Docker merge jobs
- #
- # The purpose of this job template is to run a docker build, and potentially
- # test validation of the docker image
-
- <<: *docker_job_boiler_plate
- # yamllint disable-line rule:key-duplicates
- <<: *docker_merge_boiler_plate
-
- builders:
- - lf-infra-pre-build
- - lf-infra-docker-login:
- global-settings-file: "global-settings"
- settings-file: "{mvn-settings}"
- - shell: "{pre_build_script}"
- - inject:
- # Docker registry is purposely not using an '_' so as to not conflict
- # with the Jenkins global env var
- properties-content: |
- DOCKER_ARGS={docker_build_args}
- DOCKER_NAME={docker_name}
- DOCKER_ROOT={docker_root}
- DOCKER_TAG={docker_tag}
- BUILD_MODE=SNAPSHOT
- DOCKERREGISTRY={docker_registry}
- # Do the docker build
- - shell: !include-raw: ../shell/docker-build.sh
- - inject:
- # Import the docker image information from the build step
- properties-file: "env_inject.txt"
- # Execute any post build clean-up or testing
- - shell: "{post_build_script}"
- # Provided all steps have already passed, push the docker image
- - shell: !include-raw: ../shell/docker-push.sh
-
-- job-template:
- name: "{project-name}-{stream}-verify-docker"
- # Job template for Docker verify jobs
- #
- # The purpose of this job template is to run a docker build, and potentially
- # test validation of the docker image
-
- ######################
- # Default parameters #
- ######################
-
- <<: *docker_job_boiler_plate
- # yamllint disable-line rule:key-duplicates
- <<: *docker_verify_boiler_plate
-
- builders:
- - lf-infra-pre-build
- - lf-infra-docker-login:
- global-settings-file: "global-settings"
- settings-file: "{mvn-settings}"
- - shell: "{pre_build_script}"
- - inject:
- # Docker registry is purposely not using an '_' so as to not conflict
- # with the Jenkins global env var
- properties-content: |
- DOCKER_ARGS={docker_build_args}
- DOCKER_NAME={docker_name}
- DOCKER_ROOT={docker_root}
- DOCKER_TAG={docker_tag}
- BUILD_MODE=SNAPSHOT
- DOCKERREGISTRY={docker_registry}
- # Do the docker build
- - shell: !include-raw: ../shell/docker-build.sh
- - inject:
- # Import the docker image information from the build step
- properties-file: "env_inject.txt"
- # Execute any post build clean-up or testing
- - shell: "{post_build_script}"
-
-- job-template:
- # Job template for creating a docker manifest list
- #
- # The purpose of this job template is to run:
- # 1. docker_push_manifest.sh script (which needs to exist in the
- # project implementation repo)
-
- name: "{project-name}-docker-manifest-{stream}"
- <<: *docker_job_boiler_plate
- node: "{build-node}"
- build-timeout: 15
-
- parameters:
- - lf-infra-parameters:
- project: "{project}"
- stream: "{stream}"
- branch: "{branch}"
- - string:
- name: PARENT_JOB_NAME
- default: "none"
-
- disabled: "{obj:disabled}"
-
- scm:
- - lf-infra-gerrit-scm:
- jenkins-ssh-credential: "{jenkins-ssh-credential}"
- git-url: "$GIT_URL/$PROJECT"
- refspec: "$GERRIT_REFSPEC"
- branch: "$GERRIT_BRANCH"
- submodule-recursive: true
- submodule-disable: "{submodule-disable}"
- submodule-timeout: "{submodule-timeout}"
- choosing-strategy: default
-
- builders:
- - lf-infra-docker-login:
- global-settings-file: "global-settings"
- settings-file: "{mvn-settings}"
- - shell: |
- #!/bin/bash -ex
- export PARENT_JOB_NAME
- ./docker_push_manifest.sh
-
-- job-template:
- # Job template for staging jobs on multiple architectures
- #
- # The purpose of this job template is to:
- # 1. Run parallel maven-docker-stage jobs for each supported architecure
- # 2. Build and push a docker manifest list for the images created by
- # the previous jobs
-
- name: "{project-name}-multiarch-docker-stage-{stream}"
- node: "{build-node}"
- project-type: multijob
- disabled: "{obj:disabled}"
- build-timeout: 15
- pattern: "**"
-
- parameters:
- - lf-infra-parameters:
- project: "{project}"
- stream: "{stream}"
- branch: "{branch}"
- - string:
- name: DOCKER_REGISTRY
- default: "none"
- - string:
- name: DOCKERHUB_REGISTRY
- default: "registry-1.docker.io"
-
- properties:
- - throttle:
- max-per-node: 1
- option: "project"
- - build-blocker:
- use-build-blocker: true
- blocking-jobs:
- - "{project-name}-.*-docker-.*"
- blocking-level: "NODE"
-
- scm:
- - lf-infra-gerrit-scm:
- jenkins-ssh-credential: "{jenkins-ssh-credential}"
- git-url: "$GIT_URL/$PROJECT"
- refspec: "$GERRIT_REFSPEC"
- branch: "$GERRIT_BRANCH"
- submodule-recursive: true
- submodule-timeout: 10
- submodule-disable: false
- choosing-strategy: default
-
- triggers:
- - timed: "@daily"
- - gerrit:
- server-name: "{gerrit-server-name}"
- trigger-on:
- - comment-added-contains-event:
- comment-contains-value: '^Patch Set\s+\d+:\s+stage-(docker-)?release\s*$'
-
- projects:
- - project-compare-type: ANT
- project-pattern: "{project}"
- branches:
- - branch-compare-type: ANT
- branch-pattern: "**/{branch}"
- file-paths:
- - compare-type: ANT
- pattern: "**"
-
- builders:
- - multijob:
- name: "build docker images"
- condition: ALWAYS
- execution-type: PARALLEL
- projects:
- - name: "{project-name}-amd64-maven-docker-stage-{stream}"
- kill-phase-on: FAILURE
- current-parameters: true
- - name: "{project-name}-arm64-maven-docker-stage-{stream}"
- kill-phase-on: NEVER
- current-parameters: true
- - multijob:
- name: "publish docker manifest"
- condition: SUCCESSFUL
- execution-type: PARALLEL
- projects:
- - name: "{project-name}-docker-manifest-{stream}"
- current-parameters: true
- predefined-parameters: |
- PARENT_JOB_NAME=$JOB_NAME
- DOCKERHUB_REGISTRY=docker.io
-
- publishers:
- - lf-infra-publish
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
index 46b1099be..450144f80 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
@@ -9,8 +9,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
functionality:
- "certservice":
trigger_jobs:
diff --git a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
index 540746a74..174936f7e 100644
--- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
+++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
@@ -20,8 +20,8 @@
- "master":
branch: "master"
java-version: openjdk11
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
java-version: openjdk11
project: "oom/platform/cert-service"
mvn-settings: "oom-platform-cert-service-settings"
diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml
index 55e44ede3..3f74e44a0 100644
--- a/jjb/oom/offline-installer.yaml
+++ b/jjb/oom/offline-installer.yaml
@@ -8,8 +8,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
jobs:
- "{project-name}-{stream}-review":
@@ -39,8 +39,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
- project:
name: offline-installer-pytest
diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml
index 0f8142658..0753e1cdc 100644
--- a/jjb/oom/oom-helm.yaml
+++ b/jjb/oom/oom-helm.yaml
@@ -15,8 +15,8 @@
branch: "master"
- "kohn":
branch: "kohn"
- - "jakarta":
- branch: "jakarta"
+ - "london":
+ branch: "london"
jobs:
- "{project-name}-{stream}-image-verify":
@@ -50,8 +50,8 @@
stream:
- "master":
branch: "master"
- - "kohn":
- branch: "kohn"
+ - "london":
+ branch: "london"
jobs:
- "{project-name}-{stream}-verify-make-{helm_bin}":
diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml
index 21e670613..b3e4df2f4 100644
--- a/jjb/oom/oom-main-linter.yaml
+++ b/jjb/oom/oom-main-linter.yaml
@@ -33,5 +33,5 @@
branch: "master"
- "kohn":
branch: "kohn"
- - "jakarta":
- branch: "jakarta"
+ - "london":
+ branch: "london"
diff --git a/jjb/portal-ng-e2e/portal-ng-e2e.yaml b/jjb/portal-ng-e2e/portal-ng-e2e.yaml
new file mode 100644
index 000000000..4670af8a9
--- /dev/null
+++ b/jjb/portal-ng-e2e/portal-ng-e2e.yaml
@@ -0,0 +1,15 @@
+---
+- project:
+ name: portal-ng-e2e-project-view
+ project-name: portal-ng-e2e
+ views:
+ - project-view
+
+- project:
+ name: portal-ng-e2e-info
+ project: portal-ng/e2e
+ project-name: portal-ng-e2e
+ build-node: centos8-builder-2c-1g
+ branch: master
+ jobs:
+ - gerrit-info-yaml-verify
diff --git a/jjb/portal-ng/portal-ng-bff.yaml b/jjb/portal-ng/portal-ng-bff.yaml
index 677d96f53..c733652b5 100644
--- a/jjb/portal-ng/portal-ng-bff.yaml
+++ b/jjb/portal-ng/portal-ng-bff.yaml
@@ -19,6 +19,7 @@
project-name: "portal-ng-bff"
project: "portal-ng/bff"
branch: "master"
+ build-node: ubuntu1804-docker-8c-8g
jobs:
- gerrit-gradle-build
stream:
@@ -31,6 +32,7 @@
project-name: "portal-ng-bff"
project: "portal-ng/bff"
branch: "master"
+ build-node: ubuntu1804-docker-8c-8g
docker-name: "onap/portal-ng/bff"
container-tag-method: latest
jobs: