diff options
28 files changed, 93 insertions, 241 deletions
diff --git a/global-jjb b/global-jjb -Subproject a09b8bab2c37f67f0f5e9ef36f9e93b330fdd57 +Subproject 3c627ccf046b02f12767aa45d9ac4bf515352f2 diff --git a/jjb/aai/aai-aai-common.yaml b/jjb/aai/aai-aai-common.yaml index 0327ce23c..5302908d9 100644 --- a/jjb/aai/aai-aai-common.yaml +++ b/jjb/aai/aai-aai-common.yaml @@ -23,6 +23,9 @@ - 'master': branch: 'master' mvn-params: '-P spring-boot-2-1' + - 'jakarta': + branch: 'jakarta' + mvn-params: '-P spring-boot-2-1' - 'kohn': branch: 'kohn' mvn-params: '-P spring-boot-2-1' diff --git a/jjb/aai/aai-babel.yaml b/jjb/aai/aai-babel.yaml index 3f01a460b..264a494c3 100644 --- a/jjb/aai/aai-babel.yaml +++ b/jjb/aai/aai-babel.yaml @@ -26,6 +26,8 @@ build-node: centos7-docker-8c-8g project: 'aai/babel' stream: + - 'jakarta': + branch: 'jakarta' - 'kohn': branch: 'kohn' - 'master': diff --git a/jjb/aai/aai-graphadmin.yaml b/jjb/aai/aai-graphadmin.yaml index a258cbb39..172daca90 100644 --- a/jjb/aai/aai-graphadmin.yaml +++ b/jjb/aai/aai-graphadmin.yaml @@ -29,6 +29,8 @@ branch: 'master' - 'kohn': branch: 'kohn' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'aai-graphadmin-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-logging-service.yaml b/jjb/aai/aai-logging-service.yaml index f401301eb..0097a1497 100644 --- a/jjb/aai/aai-logging-service.yaml +++ b/jjb/aai/aai-logging-service.yaml @@ -20,6 +20,8 @@ build-node: centos7-docker-8c-8g project: 'aai/logging-service' stream: + - 'jakarta': + branch: 'jakarta' - 'kohn': branch: 'kohn' - 'master': diff --git a/jjb/aai/aai-model-loader.yaml b/jjb/aai/aai-model-loader.yaml index 2a87b7e4b..a556bf7a2 100644 --- a/jjb/aai/aai-model-loader.yaml +++ b/jjb/aai/aai-model-loader.yaml @@ -26,6 +26,8 @@ build-node: centos7-docker-8c-8g project: 'aai/model-loader' stream: + - 'jakarta': + branch: 'jakarta' - 'kohn': branch: 'kohn' - 'master': diff --git a/jjb/aai/aai-resources.yaml b/jjb/aai/aai-resources.yaml index 0250b1b94..f0f443e8e 100644 --- a/jjb/aai/aai-resources.yaml +++ b/jjb/aai/aai-resources.yaml @@ -33,6 +33,8 @@ branch: 'master' - 'kohn': branch: 'kohn' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'aai-resources-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/aai/aai-rest-client.yaml b/jjb/aai/aai-rest-client.yaml index 4dd466387..614c8d71f 100644 --- a/jjb/aai/aai-rest-client.yaml +++ b/jjb/aai/aai-rest-client.yaml @@ -20,6 +20,8 @@ build-node: centos7-docker-8c-8g project: 'aai/rest-client' stream: + - 'jakarta': + branch: 'jakarta' - 'kohn': branch: 'kohn' - 'master': diff --git a/jjb/aai/aai-schema-service.yaml b/jjb/aai/aai-schema-service.yaml index 4487da352..ee1d3409b 100644 --- a/jjb/aai/aai-schema-service.yaml +++ b/jjb/aai/aai-schema-service.yaml @@ -29,6 +29,8 @@ branch: 'master' - 'kohn': branch: 'kohn' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'aai-schema-service-settings' mvn-version: 'mvn36' files: '**' diff --git a/jjb/aai/aai-sparky-be.yaml b/jjb/aai/aai-sparky-be.yaml index 7e178df82..6357793f1 100644 --- a/jjb/aai/aai-sparky-be.yaml +++ b/jjb/aai/aai-sparky-be.yaml @@ -26,6 +26,8 @@ build-node: centos7-docker-8c-8g project: 'aai/sparky-be' stream: + - 'jakarta': + branch: 'jakarta' - 'kohn': branch: 'kohn' - 'master': diff --git a/jjb/aai/aai-sparky-fe.yaml b/jjb/aai/aai-sparky-fe.yaml index d850746fc..054947173 100644 --- a/jjb/aai/aai-sparky-fe.yaml +++ b/jjb/aai/aai-sparky-fe.yaml @@ -14,6 +14,8 @@ build-node: centos7-docker-8c-8g project: 'aai/sparky-fe' stream: + - 'jakarta': + branch: 'jakarta' - 'kohn': branch: 'kohn' - 'master': diff --git a/jjb/aai/aai-traversal.yaml b/jjb/aai/aai-traversal.yaml index 5d1ace5f3..9524ccd71 100644 --- a/jjb/aai/aai-traversal.yaml +++ b/jjb/aai/aai-traversal.yaml @@ -32,6 +32,8 @@ branch: 'master' - 'kohn': branch: 'kohn' + - 'jakarta': + branch: 'jakarta' mvn-settings: 'aai-traversal-settings' mvn-version: 'mvn35' files: '**' diff --git a/jjb/global-macros.yaml b/jjb/global-macros.yaml index 50a9a573a..bc401070c 100644 --- a/jjb/global-macros.yaml +++ b/jjb/global-macros.yaml @@ -371,7 +371,7 @@ - patchset-created-event: exclude-drafts: 'false' exclude-no-code-change: 'false' - exclude-trivial-rebase: 'true' + exclude-trivial-rebase: 'false' exclude-wip: 'true' - draft-published-event - comment-added-contains-event: diff --git a/jjb/global-templates-helm.yaml b/jjb/global-templates-helm.yaml index 475efa0cb..3ce9285ec 100644 --- a/jjb/global-templates-helm.yaml +++ b/jjb/global-templates-helm.yaml @@ -107,6 +107,7 @@ server: '{server-name}' project: '{project}' branch: '{branch}' + helm_bin: '{helm_bin}' files: '{files}' builders: @@ -115,99 +116,7 @@ global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' - shell: | - echo "export HELM_BIN=helm3.6" > helm.prop - - shell: '{obj:pre_build_script}' - - shell: '{obj:build_script}' - - oom-create-netrc: - server-id: oom-helm - - inject: - properties-content: | - BUILD_TYPE=snapshot - - shell: '{obj:post_build_script}' - - lf-provide-maven-settings-cleanup - -- job-template: - name: '{project-name}-{stream}-verify-external-helm' - # Job template for helm verify jobs - - <<: *helm_job_boiler_plate - - parameters: - - lf-infra-parameters: - branch: '{branch}' - project: 'oom' - stream: '{stream}' - lftools-version: '{lftools-version}' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '$GERRIT_BRANCH' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - triggers: - - gerrit-trigger-helm-patch-submitted: - status-context: '{project}-Helm-Verify' - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '{files}' - - builders: - - lf-infra-pre-build - - inject: - properties-content: 'HELM_MODULE={helm-module}' - - shell: !include-raw-escape: shell/apply-submodule-patch-oom.sh - - shell: | - echo "export HELM_BIN=helm3.6" > helm.prop - - shell: '{obj:pre_build_script}' - - shell: '{obj:build_script}' - -- job-template: - name: '{project-name}-{stream}-merge-external-helm' - # Job template for Helm merge jobs - - <<: *helm_job_boiler_plate - - parameters: - - lf-infra-parameters: - branch: '{branch}' - project: 'oom' - stream: '{stream}' - lftools-version: '{lftools-version}' - - scm: - - lf-infra-gerrit-scm: - jenkins-ssh-credential: '{jenkins-ssh-credential}' - git-url: '{git-url}' - refspec: '$GERRIT_BRANCH' - branch: '$GERRIT_BRANCH' - submodule-recursive: '{submodule-recursive}' - submodule-timeout: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - triggers: - - gerrit-trigger-helm-patch-merged: - server: '{server-name}' - project: '{project}' - branch: '{branch}' - files: '{files}' - - builders: - - lf-infra-pre-build - - inject: - properties-content: 'HELM_MODULE={helm-module}' - - lf-provide-maven-settings: - global-settings-file: 'global-settings' - settings-file: '{mvn-settings}' - - shell: | - echo "export HELM_BIN=helm3.6" > helm.prop + echo "export HELM_BIN={helm_bin}" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - oom-create-netrc: @@ -232,6 +141,7 @@ triggers: - gerrit: + helm_bin: '{helm_bin}' server-name: '{gerrit-server-name}' trigger-on: - comment-added-contains-event: @@ -252,7 +162,7 @@ global-settings-file: '{mvn-global-settings}' settings-file: '{mvn-settings}' - shell: | - echo "export HELM_BIN=helm3.6" > helm.prop + echo "export HELM_BIN={helm_bin}" > helm.prop - shell: '{obj:pre_build_script}' - shell: '{obj:build_script}' - oom-create-netrc: @@ -262,72 +172,3 @@ BUILD_TYPE=release - shell: '{obj:post_build_script}' - lf-provide-maven-settings-cleanup - -- job-template: - name: '{project-name}-{subproject}-{stream}-verify-helm' - # Job template for helm verify jobs - - <<: *helm_job_boiler_plate - - disabled: true - builders: - - lf-infra-pre-build - - shell: | - echo "export HELM_BIN=helm3.6" > helm.prop - - shell: '{pre_build_script}' - - shell: '{build_script}' - - shell: '{post_build_script}' - -- job-template: - name: '{project-name}-{subproject}-{stream}-merge-helm' - # Job template for helm merge jobs - - <<: *helm_job_boiler_plate - - disabled: true - builders: - - lf-infra-pre-build - - shell: | - echo "export HELM_BIN=helm3.6" > helm.prop - - shell: '{pre_build_script}' - - shell: '{build_script}' - - inject: - properties-content: | - BUILD_TYPE=snapshot - - shell: '{post_build_script}' - -- job-template: - name: '{project-name}-{stream}-update-helm-weekly' - # Job template for weekly helm update jobs - # - # Required Variables: - # branch: git branch (eg. stable/lithium or master) - <<: *helm_job_boiler_plate - - disabled: true - 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: '{submodule-timeout}' - submodule-disable: '{submodule-disable}' - choosing-strategy: default - - builders: - - lf-infra-pre-build - - shell: | - echo "export HELM_BIN=helm3.6" > helm.prop - - shell: '{pre_build_script}' - - shell: '{build_script}' - - shell: '{post_build_script}' - - triggers: - # 11 AM UTC - - timed: '@daily' - - gerrit-trigger-release-manually: - server: '{server-name}' - project: '{project}' - branch: '{branch}' diff --git a/jjb/integration/include-raw-integration-robotframework.sh b/jjb/integration/include-raw-integration-robotframework.sh new file mode 100644 index 000000000..7f4ed49f3 --- /dev/null +++ b/jjb/integration/include-raw-integration-robotframework.sh @@ -0,0 +1,34 @@ +#!/bin/bash + +############################################################################## +# Copyright (c) 2016 The Linux Foundation and others. +############################################################################## + +ROBOT3_VENV=$(mktemp -d --suffix=robot3_venv) +echo "ROBOT3_VENV=${ROBOT3_VENV}" >> "${WORKSPACE}/env.properties" + +# The --system-site-packages parameter allows us to pick up system level +# installed packages. This allows us to bake matplotlib which takes very long +# to install into the image. +virtualenv --system-site-packages "${ROBOT3_VENV}" +source "${ROBOT3_VENV}/bin/activate" + +set -exu + +# Make sure pip itself us up-to-date. +pip3 install --upgrade pip + +pip3 install --no-binary pycparser cffi setuptools-rust +pip3 install pyOpenSSL docker-py importlib requests scapy netifaces netaddr ipaddr simplejson demjson +pip3 install robotframework-httplibrary robotframework-requests robotframework-sshlibrary robotframework-selenium2library robotframework-xvfb + +pip3 install xvfbwrapper +pip3 install PyVirtualDisplay + +# Print installed versions. +pip3 freeze + +# Check robot module is available and working +python3 -m robot.run --version + +# vim: sw=4 ts=4 sts=4 et ft=sh : 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 4cec29011..c5845525f 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 @@ -8,10 +8,8 @@ stream: - "master": branch: "master" - - "istanbul": - branch: "istanbul" - - "honolulu": - branch: "honolulu" + - "kohn": + branch: "kohn" 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 249e16afa..3fb2a4aad 100644 --- a/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml +++ b/jjb/oom-platform-cert-service/oom-platform-cert-service.yaml @@ -20,11 +20,8 @@ - 'master': branch: 'master' java-version: openjdk11 - - 'istanbul': - branch: 'istanbul' - java-version: openjdk11 - - 'honolulu': - branch: 'honolulu' + - 'kohn': + branch: 'kohn' java-version: openjdk11 project: 'oom/platform/cert-service' mvn-settings: 'oom-platform-cert-service-settings' diff --git a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml b/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml deleted file mode 100644 index 308dd5be4..000000000 --- a/jjb/oom-platform-keycloak/oom-platform-keycloak.yaml +++ /dev/null @@ -1,14 +0,0 @@ ---- -- project: - name: oom-platform-keycloak-project-view - project-name: oom-platform-keycloak - views: - - project-view - -- project: - name: oom-platform-keycloak-info - project: oom/platform/keycloak - project-name: oom-platform-keycloak - build-node: centos7-builder-2c-1g - jobs: - - gerrit-info-yaml-verify diff --git a/jjb/oom/offline-installer.yaml b/jjb/oom/offline-installer.yaml index 0c9b885a0..be478671f 100644 --- a/jjb/oom/offline-installer.yaml +++ b/jjb/oom/offline-installer.yaml @@ -8,8 +8,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' jobs: - '{project-name}-{stream}-review': @@ -39,8 +39,8 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' - project: name: offline-installer-pytest @@ -58,5 +58,5 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' + - 'kohn': + branch: 'kohn' diff --git a/jjb/oom/oom-helm.yaml b/jjb/oom/oom-helm.yaml index 2d06faa2c..40eca918c 100644 --- a/jjb/oom/oom-helm.yaml +++ b/jjb/oom/oom-helm.yaml @@ -24,18 +24,14 @@ stream: - "master": branch: "master" + - "kohn": + branch: "kohn" - "jakarta": branch: "jakarta" - - "istanbul": - branch: "istanbul" - helm_bin: - helm3.8 - exclude: [] - subproject: [] - jobs: - "{project-name}-{stream}-image-verify": files: "**" @@ -46,10 +42,10 @@ - "{project-name}-{stream}-merge-helm": build_script: "{oom_build_script}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: "**" + files: "kubernetes/**" build-timeout: 900 - "{project-name}-{stream}-release-helm": build_script: "{oom_build_script_skip_lint}" post_build_script: !include-raw-escape: shell/publish_helm_charts.sh - files: "**" + files: "kubernetes/**" build-timeout: 900 diff --git a/jjb/oom/oom-main-linter.yaml b/jjb/oom/oom-main-linter.yaml index b6653d44f..0f49ead3a 100644 --- a/jjb/oom/oom-main-linter.yaml +++ b/jjb/oom/oom-main-linter.yaml @@ -30,7 +30,7 @@ stream: - "master": branch: "master" - - "istanbul": - branch: "istanbul" + - "kohn": + branch: "kohn" - "jakarta": branch: "jakarta" diff --git a/jjb/oom/oom-readiness.yaml b/jjb/oom/oom-readiness.yaml index 5a8257baa..de9308990 100644 --- a/jjb/oom/oom-readiness.yaml +++ b/jjb/oom/oom-readiness.yaml @@ -31,8 +31,6 @@ stream: - 'master': branch: 'master' - - 'jakarta': - branch: 'jakarta' - project: name: oom-readiness-release diff --git a/jjb/sdc/sdc.yaml b/jjb/sdc/sdc.yaml index c5e2e0cb0..61cb705fe 100644 --- a/jjb/sdc/sdc.yaml +++ b/jjb/sdc/sdc.yaml @@ -51,6 +51,7 @@ sign-artifacts: true build-node: centos7-builder-4c-4g maven-versions-plugin: true + mvn-version: 'mvn36' mvn-params: '-DskipTests=true -Dnpm.registry=https://nexus3.onap.org/repository/npm.public/npm/-/' - gerrit-maven-docker-stage: build-node: ubuntu1804-docker-v1-8c-8g diff --git a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml index 86f3f21a6..60412f7c5 100644 --- a/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml +++ b/jjb/so/so-adapters-so-etsi-sol003-adapter.yaml @@ -39,6 +39,9 @@ - 'honolulu': branch: 'honolulu' java-version: openjdk11 + - 'kohn': + branch: 'kohn' + java-version: openjdk11 mvn-settings: 'so-adapters-so-etsi-sol003-adapter-settings' files: '**' archive-artifacts: '' diff --git a/jjb/so/so-adapters-so-nssmf-adapter.yaml b/jjb/so/so-adapters-so-nssmf-adapter.yaml index d230d005e..b311dd5f7 100644 --- a/jjb/so/so-adapters-so-nssmf-adapter.yaml +++ b/jjb/so/so-adapters-so-nssmf-adapter.yaml @@ -42,6 +42,9 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 + - 'kohn': + branch: 'kohn' + java-version: openjdk11 mvn-settings: 'so-adapters-so-nssmf-adapter-settings' files: '**' archive-artifacts: '' diff --git a/jjb/so/so.yaml b/jjb/so/so.yaml index 1eb3c0651..43609ca76 100644 --- a/jjb/so/so.yaml +++ b/jjb/so/so.yaml @@ -32,6 +32,9 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 + - 'kohn': + branch: 'kohn' + java-version: openjdk11 - 'recursive-orch': branch: 'recursive-orch' java-version: openjdk11 @@ -118,3 +121,6 @@ - 'jakarta': branch: 'jakarta' java-version: openjdk11 + - 'kohn': + branch: 'kohn' + java-version: openjdk11 diff --git a/packer/provision/helm.yaml b/packer/provision/helm.yaml index d3ab71bbd..7173e98f4 100644 --- a/packer/provision/helm.yaml +++ b/packer/provision/helm.yaml @@ -6,8 +6,7 @@ become_method: sudo vars: - kubectl_version: 1.23.7 - helm3_6_version: 3.6.3 + kubectl_version: 1.23.8 helm3_8_version: 3.8.2 chartmuseum_version: 0.12.0 @@ -19,39 +18,6 @@ mode: 0775 become: yes - - name: 'Install Helm3.6 {{helm3_6_version}}' - block: - - name: 'Create directory /tmp/helm3.6' - file: - path: /tmp/helm3.6 - state: directory - - name: 'Fetch tar.gz for Helm 3.6' - get_url: - url: "https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz" - dest: /tmp/helm3.6 - - name: 'Unarchive Helm 3.6' - unarchive: - src: "/tmp/helm3.6/helm-v{{helm3_6_version}}-linux-amd64.tar.gz" - dest: /tmp/helm3.6 - remote_src: true - become: yes - - name: 'Move Helm 3.6 bin to /usr/local/bin and set as executable' - command: 'mv /tmp/helm3.6/linux-amd64/helm /usr/local/bin/helm3.6' - become: yes - - name: 'Check Helm 3.6' - command: 'which helm3.6' - - name: 'Check kubectl {{kubectl_version}}' - command: 'which kubectl' - - - name: 'Install Helm 3.6' - shell: | - echo "----> Installing helm3.6" - wget 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz' - tar -xvf 'https://get.helm.sh/helm-v{{helm3_6_version}}-linux-amd64.tar.gz' - mv linux-amd64/helm /usr/local/bin/helm3.6 - which helm3.6 - become: true - - name: 'Install Helm3.8 {{helm3_8_version}}' block: - name: 'Create directory /tmp/helm3.8' diff --git a/shell/helm-repo-init.sh b/shell/helm-repo-init.sh index 3228aa37e..953abb802 100755 --- a/shell/helm-repo-init.sh +++ b/shell/helm-repo-init.sh @@ -6,6 +6,6 @@ mkdir -p ".chartstorage" chartmuseum --port=6464 --storage="local" --storage-local-rootdir=".chartstorage" &> /dev/null & source helm.prop -$HELM_BIN plugin install --version v0.10.2 https://github.com/chartmuseum/helm-push.git || true +$HELM_BIN plugin install --version v0.10.3 https://github.com/chartmuseum/helm-push.git || true $HELM_BIN repo add local http://localhost:6464 $HELM_BIN repo add onap http://localhost:6464 |