Merge "Migrate DMI Plugin jobs to Java 17"
authorJessica Wagantall <jwagantall@linuxfoundation.org>
Mon, 24 Jul 2023 18:05:27 +0000 (18:05 +0000)
committerGerrit Code Review <gerrit@onap.org>
Mon, 24 Jul 2023 18:05:27 +0000 (18:05 +0000)
50 files changed:
.github/workflows/gerrit-ci-management-merge.yaml
INFO.yaml
jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/content [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/customizedCredentialMappings.sandbox.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/customizedCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/portal-ng-bff-settings/config-params.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/config-params.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-bff-settings/content [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/content with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-bff-settings/serverCredentialMappings.sandbox.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.sandbox.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-bff-settings/serverCredentialMappings.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-bff/serverCredentialMappings.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/config-params.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/content [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-history/content with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.sandbox.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.sandbox.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.yaml [new file with mode: 0644]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history-settings/config-params.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-history/config-params.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history-settings/content [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/content with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history-settings/serverCredentialMappings.sandbox.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.sandbox.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-history-settings/serverCredentialMappings.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-history/serverCredentialMappings.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/config-params.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/config-params.yaml with 100% similarity]
jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/content [new symlink]
jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/serverCredentialMappings.sandbox.yaml [new symlink]
jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/serverCredentialMappings.yaml [moved from jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences/serverCredentialMappings.yaml with 100% similarity]
jjb/aai/aai-aai-common.yaml
jjb/ci-management/ci-management.yaml
jjb/dmaap/dmaap-buscontroller.yaml
jjb/dmaap/dmaap-datarouter.yaml
jjb/dmaap/dmaap-messagerouter-dmaapclient.yaml
jjb/dmaap/dmaap-messagerouter-messageservice.yaml
jjb/doc/rules.yaml
jjb/global-templates-docker.yaml [deleted file]
jjb/oom-platform-cert-service/oom-platform-cert-service-csit.yaml
jjb/oom-platform-cert-service/oom-platform-cert-service.yaml
jjb/oom/offline-installer.yaml
jjb/oom/oom-helm.yaml
jjb/oom/oom-main-linter.yaml
jjb/portal-ng-e2e/portal-ng-e2e.yaml [new file with mode: 0644]
jjb/portal-ng/portal-ng-bff.yaml
packer/common-packer
packer/provision/devstack-centos.yaml
packer/provision/devstack.yaml [new symlink]
packer/templates/builder-aws.pkr.hcl [new symlink]
packer/templates/builder.pkr.hcl [new symlink]
packer/templates/devstack-pre-pip-yoga.pkr.hcl [new symlink]
packer/templates/devstack.pkr.hcl [new symlink]
packer/templates/docker.pkr.hcl [new symlink]
packer/templates/helm.pkr.hcl [new file with mode: 0644]
packer/templates/memcached.pkr.hcl [new file with mode: 0644]
packer/templates/redis.pkr.hcl [new file with mode: 0644]
shell/docker-build.sh [deleted file]
shell/docker-push.sh [deleted file]

index 78f783f..9764494 100644 (file)
@@ -58,3 +58,4 @@ jobs:
       GERRIT_REFSPEC: ${{ inputs.GERRIT_REFSPEC }}
     secrets:
       JOBBUILDER_PROD_PSW: ${{ secrets.JOBBUILDER_PROD_PSW }}
+      GERRIT_SSH_PRIVKEY: ${{ secrets.GERRIT_SSH_PRIVKEY }}
index 8c09088..79a423a 100644 (file)
--- a/INFO.yaml
+++ b/INFO.yaml
@@ -64,7 +64,7 @@ committers:
   - name: "Matt Watkins"
     email: "mwatkins@linuxfoundation.org"
     company: "LF"
-    id: "modeSevenindustrialsolutions"
+    id: "modesevenindustrialsolutions"
     timezone: "Europe/London"
   - name: "Thomas Kulik"
     email: "thomas.kulik@telekom.de"
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/config-params.yaml b/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/config-params.yaml
new file mode 100644 (file)
index 0000000..64085af
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "packer-cloud-env-hcl"
+comment: "Packer cloud environmnet HCL2 config"
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/content b/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/content
new file mode 100644 (file)
index 0000000..df1b36d
--- /dev/null
@@ -0,0 +1,6 @@
+cloud_auth_url = "https://auth.vexxhost.net/v3/"
+cloud_tenant = "ef6e8825-fc3a-4ebf-886a-ba51ada06a9c"
+cloud_user = "$CLOUD_USR"
+cloud_pass = "$CLOUD_PSW"
+cloud_network = "bd089be9-e846-4afe-905b-8bb6c7c90faf"
+ssh_proxy_host = ""
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/customizedCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/customizedCredentialMappings.sandbox.yaml
new file mode 100644 (file)
index 0000000..273a003
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "packer-cloud-user"
+    tokenKey: "CLOUD"
diff --git a/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/customizedCredentialMappings.yaml b/jenkins-config/managed-config-files/custom/packer-cloud-env-hcl/customizedCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..273a003
--- /dev/null
@@ -0,0 +1,4 @@
+---
+customizedCredentialMappings:
+  - credentialsId: "packer-cloud-user"
+    tokenKey: "CLOUD"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/config-params.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/config-params.yaml
new file mode 100644 (file)
index 0000000..53bad9d
--- /dev/null
@@ -0,0 +1,3 @@
+---
+name: "portal-ng-e2e"
+comment: "portal-ng-e2e"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-e2e/serverCredentialMappings.yaml
new file mode 100644 (file)
index 0000000..aa02b83
--- /dev/null
@@ -0,0 +1,18 @@
+---
+serverCredentialMappings:
+  - serverId: "ecomp-snapshots"
+    credentialsId: "portal-ng-e2e"
+  - serverId: "ecomp-site"
+    credentialsId: "portal-ng-e2e"
+  - serverId: "ecomp-staging"
+    credentialsId: "portal-ng-e2e"
+  - serverId: "nexus3.onap.org:10001"
+    credentialsId: "portal-ng-e2e"
+  - serverId: "nexus3.onap.org:10002"
+    credentialsId: "portal-ng-e2e"
+  - serverId: "nexus3.onap.org:10003"
+    credentialsId: "portal-ng-e2e"
+  - serverId: "nexus3.onap.org:10004"
+    credentialsId: "portal-ng-e2e"
+  - serverId: "docker.io"
+    credentialsId: "onap_dockerhub_creds"
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/content b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/content
new file mode 120000 (symlink)
index 0000000..e830ebd
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-content
\ No newline at end of file
diff --git a/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/serverCredentialMappings.sandbox.yaml b/jenkins-config/managed-config-files/mavenSettings/portal-ng-preferences-settings/serverCredentialMappings.sandbox.yaml
new file mode 120000 (symlink)
index 0000000..8f92057
--- /dev/null
@@ -0,0 +1 @@
+../../../managed-config-templates/mavenSettings-serverCredentialMappings.sandbox.yaml
\ No newline at end of file
index a068a44..280972a 100644 (file)
@@ -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"
           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/**"
index 98c063e..ccb03d7 100644 (file)
@@ -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: ""
index 35b8852..a661b4a 100644 (file)
@@ -23,8 +23,8 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
+      - "london":
+          branch: "london"
     mvn-settings: "dmaap-buscontroller-settings"
     files: "**"
     archive-artifacts: ""
index 304e040..b18b852 100644 (file)
@@ -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"
     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
index 47dff2f..6eee793 100644 (file)
@@ -16,8 +16,8 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
+      - "london":
+          branch: "london"
     mvn-settings: "dmaap-messagerouter-dmaapclient-settings"
     files: "**"
     archive-artifacts: ""
index c700779..934b0a8 100644 (file)
@@ -18,8 +18,8 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
+      - "london":
+          branch: "london"
     mvn-settings: "dmaap-messagerouter-messageservice-settings"
     java-version: openjdk11
     files: "**"
index 462bdf0..b78c5aa 100644 (file)
@@ -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."
                   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 (file)
index a584674..0000000
+++ /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
index 46b1099..450144f 100644 (file)
@@ -9,8 +9,8 @@
     stream:
       - "master":
           branch: "master"
-      - "kohn":
-          branch: "kohn"
+      - "london":
+          branch: "london"
     functionality:
       - "certservice":
           trigger_jobs:
index 540746a..174936f 100644 (file)
@@ -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"
index 55e44ed..3f74e44 100644 (file)
@@ -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
index 0f81426..0753e1c 100644 (file)
@@ -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}":
index 21e6706..b3e4df2 100644 (file)
@@ -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 (file)
index 0000000..4670af8
--- /dev/null
@@ -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
index 677d96f..c733652 100644 (file)
@@ -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:
index 17bfe57..09cb3bc 160000 (submodule)
@@ -1 +1 @@
-Subproject commit 17bfe57174ebf0e699cfcc235e83d6d568695651
+Subproject commit 09cb3bcf48185afdc5af0a548be904491ae215de
index dc02778..7f43aab 120000 (symlink)
@@ -1 +1 @@
-../common-packer/provision/devstack-centos.yaml
\ No newline at end of file
+../common-packer/provision/devstack.yaml
\ No newline at end of file
diff --git a/packer/provision/devstack.yaml b/packer/provision/devstack.yaml
new file mode 120000 (symlink)
index 0000000..7f43aab
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/provision/devstack.yaml
\ No newline at end of file
diff --git a/packer/templates/builder-aws.pkr.hcl b/packer/templates/builder-aws.pkr.hcl
new file mode 120000 (symlink)
index 0000000..d82c073
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/templates/builder-aws.pkr.hcl
\ No newline at end of file
diff --git a/packer/templates/builder.pkr.hcl b/packer/templates/builder.pkr.hcl
new file mode 120000 (symlink)
index 0000000..8ea2d87
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/templates/builder.pkr.hcl
\ No newline at end of file
diff --git a/packer/templates/devstack-pre-pip-yoga.pkr.hcl b/packer/templates/devstack-pre-pip-yoga.pkr.hcl
new file mode 120000 (symlink)
index 0000000..9be8ba8
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/templates/devstack-pre-pip-yoga.pkr.hcl
\ No newline at end of file
diff --git a/packer/templates/devstack.pkr.hcl b/packer/templates/devstack.pkr.hcl
new file mode 120000 (symlink)
index 0000000..25b407e
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/templates/devstack.pkr.hcl
\ No newline at end of file
diff --git a/packer/templates/docker.pkr.hcl b/packer/templates/docker.pkr.hcl
new file mode 120000 (symlink)
index 0000000..08567df
--- /dev/null
@@ -0,0 +1 @@
+../common-packer/templates/docker.pkr.hcl
\ No newline at end of file
diff --git a/packer/templates/helm.pkr.hcl b/packer/templates/helm.pkr.hcl
new file mode 100644 (file)
index 0000000..8468fcb
--- /dev/null
@@ -0,0 +1,169 @@
+packer {
+  required_plugins {
+    openstack = {
+      version = ">= 1.0.0"
+      source  = "github.com/hashicorp/openstack"
+    }
+  }
+}
+
+variable "cloud_auth_url" {
+  type    = string
+  default = null
+}
+
+variable "cloud_tenant" {
+  type    = string
+  default = null
+}
+
+variable "cloud_user" {
+  type    = string
+  default = null
+}
+
+variable "cloud_pass" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_name" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_product_code" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_owner" {
+  type    = string
+  default = null
+}
+
+variable "ansible_roles_path" {
+  type    = string
+  default = ".galaxy"
+}
+
+variable "arch" {
+  type    = string
+  default = "x86_64"
+}
+
+variable "base_image" {
+  type = string
+  default = null
+}
+
+variable "cloud_network" {
+  type = string
+  default = null
+}
+
+variable "cloud_region" {
+  type    = string
+  default = "ca-ymq-1"
+}
+
+variable "cloud_user_data" {
+  type = string
+  default = null
+}
+
+variable "distro" {
+  type = string
+  default = null
+}
+
+variable "docker_source_image" {
+  type = string
+  default = null
+}
+
+variable "flavor" {
+  type    = string
+  default = "v2-highcpu-1"
+}
+
+variable "ssh_proxy_host" {
+  type    = string
+  default = ""
+}
+
+variable "ssh_user" {
+  type = string
+  default = null
+}
+
+variable "vm_image_disk_format" {
+  type    = string
+  default = ""
+}
+
+variable "vm_use_block_storage" {
+  type    = string
+  default = "true"
+}
+
+variable "vm_volume_size" {
+  type    = string
+  default = "20"
+}
+
+source "docker" "helm" {
+  changes = ["ENTRYPOINT [\"\"]", "CMD [\"\"]"]
+  commit  = true
+  image   = "${var.docker_source_image}"
+}
+
+source "openstack" "helm" {
+  domain_name       = "Default"
+  flavor            = "${var.flavor}"
+  identity_endpoint = "${var.cloud_auth_url}"
+  image_name        = "ZZCI - ${var.distro} - helm - ${var.arch} - ${legacy_isotime("20060102-150405.000")}"
+  instance_name     = "${var.distro}-builder-${uuidv4()}"
+  metadata = {
+    ci_managed = "yes"
+  }
+  networks          = ["${var.cloud_network}"]
+  password          = "${var.cloud_pass}"
+  region            = "ca-ymq-1"
+  source_image_name = "${var.base_image}"
+  ssh_proxy_host    = "${var.ssh_proxy_host}"
+  ssh_username      = "${var.ssh_user}"
+  tenant_name       = "${var.cloud_tenant}"
+  user_data_file    = "${var.cloud_user_data}"
+  username          = "${var.cloud_user}"
+}
+
+build {
+  sources = ["source.docker.helm", "source.openstack.helm"]
+
+  provisioner "shell" {
+    execute_command = "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    scripts         = ["common-packer/provision/install-python.sh"]
+  }
+
+  provisioner "shell-local" {
+    command = "./common-packer/ansible-galaxy.sh ${var.ansible_roles_path}"
+  }
+
+  provisioner "ansible" {
+    ansible_env_vars   = [
+      "ANSIBLE_NOCOWS=1",
+      "ANSIBLE_PIPELINING=True",
+      "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+      "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+      "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
+    command            = "./common-packer/ansible-playbook.sh"
+    extra_arguments    = [
+      "--scp-extra-args", "'-O'",
+      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+    ]
+    playbook_file      = "provision/helm.yaml"
+    skip_version_check = true
+  }
+}
diff --git a/packer/templates/memcached.pkr.hcl b/packer/templates/memcached.pkr.hcl
new file mode 100644 (file)
index 0000000..cd1a610
--- /dev/null
@@ -0,0 +1,168 @@
+packer {
+  required_plugins {
+    openstack = {
+      version = ">= 1.0.0"
+      source  = "github.com/hashicorp/openstack"
+    }
+  }
+}
+
+variable "cloud_auth_url" {
+  type    = string
+  default = null
+}
+
+variable "cloud_tenant" {
+  type    = string
+  default = null
+}
+
+variable "cloud_user" {
+  type    = string
+  default = null
+}
+
+variable "cloud_pass" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_name" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_product_code" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_owner" {
+  type    = string
+  default = null
+}
+
+variable "ansible_roles_path" {
+  type    = string
+  default = ".galaxy"
+}
+
+variable "arch" {
+  type    = string
+  default = "x86_64"
+}
+
+variable "base_image" {
+  type = string
+  default = null
+}
+
+variable "cloud_network" {
+  type = string
+  default = null
+}
+
+variable "cloud_region" {
+  type    = string
+  default = "ca-ymq-1"
+}
+
+variable "cloud_user_data" {
+  type = string
+  default = null
+}
+
+variable "distro" {
+  type = string
+  default = null
+}
+
+variable "docker_source_image" {
+  type = string
+  default = null
+}
+
+variable "flavor" {
+  type    = string
+  default = "v2-highcpu-1"
+}
+
+variable "ssh_proxy_host" {
+  type    = string
+  default = ""
+}
+
+variable "ssh_user" {
+  type = string
+  default = null
+}
+
+variable "vm_image_disk_format" {
+  type    = string
+  default = ""
+}
+
+variable "vm_use_block_storage" {
+  type    = string
+  default = "true"
+}
+
+variable "vm_volume_size" {
+  type    = string
+  default = "20"
+}
+
+source "docker" "memcached" {
+  changes = ["ENTRYPOINT [\"\"]", "CMD [\"\"]"]
+  commit  = true
+  image   = "${var.docker_source_image}"
+}
+
+source "openstack" "memcached" {
+  domain_name       = "Default"
+  flavor            = "${var.flavor}"
+  identity_endpoint = "${var.cloud_auth_url}"
+  image_name        = "${var.distro} - memcached - ${var.arch} - ${legacy_isotime("20180101-1003")}"
+  metadata = {
+    ci_managed = "yes"
+  }
+  networks          = ["${var.cloud_network}"]
+  password          = "${var.cloud_pass}"
+  region            = "ca-ymq-1"
+  source_image_name = "${var.base_image}"
+  ssh_proxy_host    = "${var.ssh_proxy_host}"
+  ssh_username      = "${var.ssh_user}"
+  tenant_name       = "${var.cloud_tenant}"
+  user_data_file    = "${var.cloud_user_data}"
+  username          = "${var.cloud_user}"
+}
+
+build {
+  sources = ["source.docker.memcached", "source.openstack.memcached"]
+
+  provisioner "shell" {
+    execute_command = "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    scripts         = ["common-packer/provision/install-python.sh"]
+  }
+
+  provisioner "shell-local" {
+    command = "./common-packer/ansible-galaxy.sh ${var.ansible_roles_path}"
+  }
+
+  provisioner "ansible" {
+    ansible_env_vars   = [
+      "ANSIBLE_NOCOWS=1",
+      "ANSIBLE_PIPELINING=True",
+      "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+      "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+      "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
+    command            = "./common-packer/ansible-playbook.sh"
+    extra_arguments    = [
+      "--scp-extra-args", "'-O'",
+      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+    ]
+    playbook_file      = "provision/memcached.yaml"
+    skip_version_check = true
+  }
+}
diff --git a/packer/templates/redis.pkr.hcl b/packer/templates/redis.pkr.hcl
new file mode 100644 (file)
index 0000000..f1c263a
--- /dev/null
@@ -0,0 +1,168 @@
+packer {
+  required_plugins {
+    openstack = {
+      version = ">= 1.0.0"
+      source  = "github.com/hashicorp/openstack"
+    }
+  }
+}
+
+variable "cloud_auth_url" {
+  type    = string
+  default = null
+}
+
+variable "cloud_tenant" {
+  type    = string
+  default = null
+}
+
+variable "cloud_user" {
+  type    = string
+  default = null
+}
+
+variable "cloud_pass" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_name" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_product_code" {
+  type    = string
+  default = null
+}
+
+variable "source_ami_filter_owner" {
+  type    = string
+  default = null
+}
+
+variable "ansible_roles_path" {
+  type    = string
+  default = ".galaxy"
+}
+
+variable "arch" {
+  type    = string
+  default = "x86_64"
+}
+
+variable "base_image" {
+  type = string
+  default = null
+}
+
+variable "cloud_network" {
+  type = string
+  default = null
+}
+
+variable "cloud_region" {
+  type    = string
+  default = "ca-ymq-1"
+}
+
+variable "cloud_user_data" {
+  type = string
+  default = null
+}
+
+variable "distro" {
+  type = string
+  default = null
+}
+
+variable "docker_source_image" {
+  type = string
+  default = null
+}
+
+variable "flavor" {
+  type    = string
+  default = "v2-highcpu-1"
+}
+
+variable "ssh_proxy_host" {
+  type    = string
+  default = ""
+}
+
+variable "ssh_user" {
+  type = string
+  default = null
+}
+
+variable "vm_image_disk_format" {
+  type    = string
+  default = ""
+}
+
+variable "vm_use_block_storage" {
+  type    = string
+  default = "true"
+}
+
+variable "vm_volume_size" {
+  type    = string
+  default = "20"
+}
+
+source "docker" "redis" {
+  changes = ["ENTRYPOINT [\"\"]", "CMD [\"\"]"]
+  commit  = true
+  image   = "${var.docker_source_image}"
+}
+
+source "openstack" "redis" {
+  domain_name       = "Default"
+  flavor            = "v1-standard-1"
+  identity_endpoint = "${var.cloud_auth_url}"
+  image_name        = "${var.distro} - redis - ${var.arch} - ${legacy_isotime("20180101-1003")}"
+  metadata = {
+    ci_managed = "yes"
+  }
+  networks          = ["${var.cloud_network}"]
+  password          = "${var.cloud_pass}"
+  region            = "ca-ymq-1"
+  source_image_name = "${var.base_image}"
+  ssh_proxy_host    = "${var.ssh_proxy_host}"
+  ssh_username      = "${var.ssh_user}"
+  tenant_name       = "${var.cloud_tenant}"
+  user_data_file    = "${var.cloud_user_data}"
+  username          = "${var.cloud_user}"
+}
+
+build {
+  sources = ["source.docker.redis", "source.openstack.redis"]
+
+  provisioner "shell" {
+    execute_command = "chmod +x {{ .Path }}; if [ \"$UID\" == \"0\" ]; then {{ .Vars }} '{{ .Path }}'; else {{ .Vars }} sudo -E '{{ .Path }}'; fi"
+    scripts         = ["common-packer/provision/install-python.sh"]
+  }
+
+  provisioner "shell-local" {
+    command = "./common-packer/ansible-galaxy.sh ${var.ansible_roles_path}"
+  }
+
+  provisioner "ansible" {
+    ansible_env_vars   = [
+      "ANSIBLE_NOCOWS=1",
+      "ANSIBLE_PIPELINING=True",
+      "ANSIBLE_ROLES_PATH=${var.ansible_roles_path}",
+      "ANSIBLE_CALLBACK_WHITELIST=profile_tasks",
+      "ANSIBLE_STDOUT_CALLBACK=debug"
+    ]
+    command            = "./common-packer/ansible-playbook.sh"
+    extra_arguments    = [
+      "--scp-extra-args", "'-O'",
+      "--ssh-extra-args", "-o IdentitiesOnly=yes -o HostKeyAlgorithms=+ssh-rsa -o PubkeyAcceptedAlgorithms=+ssh-rsa"
+    ]
+    playbook_file      = "provision/redis.yaml"
+    skip_version_check = true
+  }
+}
diff --git a/shell/docker-build.sh b/shell/docker-build.sh
deleted file mode 100644 (file)
index 1cb71d3..0000000
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-# Ensure we fail the job if any steps fail
-# Do not set -u as DOCKER_ARGS may be unbound
-set -e -o pipefail
-
-FULL_DATE=`date +'%Y%m%dT%H%M%S'`
-IMAGE_VERSION=`xmlstarlet sel -N "x=http://maven.apache.org/POM/4.0.0" -t -v "/x:project/x:version" pom.xml | cut -c1-5`
-
-case "$BUILD_MODE" in
-   "STAGING")
-      DOCKER_TAG="$IMAGE_VERSION"-STAGING-"$FULL_DATE"Z
-      DOCKER_LATEST_TAG="$IMAGE_VERSION"-STAGING-latest
-      echo "Using tags $DOCKER_TAG and $DOCKER_LATEST_TAG"
-      ;;
-   "SNAPSHOT")
-      DOCKER_TAG="$IMAGE_VERSION"-SNAPSHOT-"$FULL_DATE"Z
-      DOCKER_LATEST_TAG="$IMAGE_VERSION"-SNAPSHOT-latest
-      echo "Using tags $DOCKER_TAG and $DOCKER_LATEST_TAG"
-      ;;
-esac
-
-# Switch to the directory where the Dockerfile is
-cd "$DOCKER_ROOT"
-
-# DOCKERREGISTRY is purposely not using an '_' so as to not conflict with the
-# Jenkins global env var of the DOCKER_REGISTRY which the docker-login step uses
-IMAGE_NAME="$DOCKERREGISTRY/$DOCKER_NAME:$DOCKER_TAG"
-IMAGE_NAME_LATEST="$DOCKERREGISTRY/$DOCKER_NAME:$DOCKER_LATEST_TAG"
-
-# Build the docker image
-
-# Allow word splitting
-# shellcheck disable=SC2086
-docker build $DOCKER_ARGS . -t $IMAGE_NAME -t $IMAGE_NAME_LATEST | tee "$WORKSPACE/docker_build_log.txt"
-
-# Write DOCKER_IMAGE information to a file so it can be injected into the
-# environment for following steps
-echo "DOCKER_IMAGE=$IMAGE_NAME" >> "$WORKSPACE/env_inject.txt"
-echo "DOCKER_IMAGE_LATEST=$IMAGE_NAME_LATEST" >> "$WORKSPACE/env_inject.txt"
-
-
diff --git a/shell/docker-push.sh b/shell/docker-push.sh
deleted file mode 100644 (file)
index 937a01a..0000000
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-# Ensure we fail the job if any steps fail
-set -e -o pipefail
-
-# Push our image to wherever it's defined to go by the name
-docker push "$DOCKER_IMAGE"
-docker push "$DOCKER_IMAGE_LATEST"