From: Jessica Wagantall <jwagantall@linuxfoundation.org>
Date: Mon, 25 Jul 2022 18:03:17 +0000 (+0000)
Subject: Merge "[DCAE] Fix verify jobs trigger overlap"
X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=c03571cc11b229da8a9010398a5e351d0b956b4a;hp=1d59863f8f6d0719f911a11f40b13d0c34ed3fca;p=ci-management.git

Merge "[DCAE] Fix verify jobs trigger overlap"
---

diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
deleted file mode 100644
index 66378f8a1..000000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-assembly.yaml
+++ /dev/null
@@ -1,25 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod2-assembly
-    project-name: dcaegen2-platform-mod2
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - assembly:
-          pom: 'mod2/assembly/pom.xml'
-          pattern: 'mod2/assembly/**'
-    stream:
-      - 'master':
-          branch: 'master'
-          java-version: openjdk11
-    mvn-settings: dcaegen2-platform-settings
-    maven-version: 'mvn35'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
deleted file mode 100644
index 219a4d915..000000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-authservice.yaml
+++ /dev/null
@@ -1,38 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod2-auth-service
-    project-name: dcaegen2-platform-mod2
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - auth-service:
-          pom: 'mod2/auth-service/pom.xml'
-          pattern: 'mod2/auth-service/**'
-    stream:
-      - 'master':
-          branch: 'master'
-          java-version: openjdk11
-    mvn-settings: dcaegen2-platform-settings
-    maven-version: 'mvn35'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dcaegen2-platform-mod2-auth-service-clm
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: dcaegen2-platform-mod2-auth-service-clm
-    mvn-params: '-f mod2/auth-service/pom.xml'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
deleted file mode 100644
index 274d7e595..000000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-catalogservice.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod2-catalog-service
-    project-name: dcaegen2-platform-mod2
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - catalog-service:
-          pom: 'mod2/catalog-service/pom.xml'
-          pattern: 'mod2/catalog-service/**'
-    stream:
-      - 'master':
-          branch: 'master'
-          java-version: openjdk11
-    mvn-settings: dcaegen2-platform-settings
-    maven-version: 'mvn35'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dcaegen2-platform-mod2-catalog-service-sonar
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod2-catalog-service'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f mod2/catalog-service/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-mod2-catalog-service-clm
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: dcaegen2-platform-mod2-catalog-service-clm
-    mvn-params: '-f mod2/catalog-service/pom.xml'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml b/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
deleted file mode 100644
index 3d8ea65fd..000000000
--- a/jjb/dcaegen2/dcaegen2-platform-mod2-ui.yaml
+++ /dev/null
@@ -1,58 +0,0 @@
----
-- project:
-    name: dcaegen2-platform-mod2-ui
-    project-name: dcaegen2-platform-mod2
-    # git repo
-    project: dcaegen2/platform
-    jobs:
-      - '{project-name}-{stream}-{subproject}-verify-java'
-      - '{project-name}-{stream}-{subproject}-merge-java':
-          mvn-goals: 'clean install'
-    subproject:
-      - ui:
-          pom: 'mod2/ui/pom.xml'
-          pattern: 'mod2/ui/**'
-    stream:
-      - 'master':
-          branch: 'master'
-          java-version: openjdk11
-    mvn-settings: dcaegen2-platform-settings
-    maven-version: 'mvn35'
-    maven-deploy-properties: |
-      deployAtEnd=true
-    files: '**'
-    archive-artifacts: ''
-    build-node: ubuntu1804-docker-8c-8g
-
-- project:
-    name: dcaegen2-platform-mod2-ui-sonar
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-sonar
-    sonarcloud: true
-    sonarcloud-project-organization: '{sonarcloud_project_organization}'
-    sonarcloud-api-token: '{sonarcloud_api_token}'
-    sonarcloud-project-key: '{sonarcloud_project_organization}_{project-name}'
-    sonar-mvn-goal: '{sonar_mvn_goal}'
-    cron: '@daily'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: 'dcaegen2-platform-mod2-ui'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
-    mvn-params: '-f mod2/ui/pom.xml'
-    mvn-goals: 'clean install'
-    mvn-opts: '-Xmx1024m -XX:MaxPermSize=256m'
-
-- project:
-    name: dcaegen2-platform-mod2-ui-clm
-    java-version: openjdk11
-    jobs:
-      - gerrit-maven-clm
-    nexus-iq-namespace: 'onap-'
-    build-node: ubuntu1804-docker-8c-8g
-    project: 'dcaegen2/platform'
-    project-name: dcaegen2-platform-mod2-ui-clm
-    mvn-params: '-f mod2/ui/pom.xml'
-    branch: 'master'
-    mvn-settings: 'dcaegen2-platform-settings'
diff --git a/shell/onap-gerrit-review-wrapper.sh b/shell/onap-gerrit-review-wrapper.sh
index ba07fe724..0195b8092 100755
--- a/shell/onap-gerrit-review-wrapper.sh
+++ b/shell/onap-gerrit-review-wrapper.sh
@@ -32,5 +32,7 @@ rm -Rf /tmp/ogr
 export PATH=$PATH:/tmp/ogr/onap-gerrit-review/bin
 
 # Execute OGR
-onap-gerrit-review -E git pull "https://gerrit.onap.org/r/$GERRIT_PROJECT" "$GERRIT_REFSPEC"
+onap-gerrit-review -S git pull "https://gerrit.onap.org/r/$GERRIT_PROJECT" "$GERRIT_REFSPEC"
+# Use -E flag for non-blocking report
+# onap-gerrit-review -S -E git pull "https://gerrit.onap.org/r/$GERRIT_PROJECT" "$GERRIT_REFSPEC"