From 01019e24d97db1d8bff406fa9c903b9b1f1e2211 Mon Sep 17 00:00:00 2001 From: Chengkai Yan Date: Thu, 2 Dec 2021 17:39:19 +0000 Subject: [PATCH] Revert "Update nonrtric jjb for the change of folder names in master branch" This reverts commit 6868795efe168bc52b4044f951b5c3c2ae338ed9. Reason for revert: The merge job is still failing, will revert this and continue to find a solution Change-Id: I96daee04bbb180169aee2956c5b2b2bd1e24f2e0 Signed-off-by: ecaiyanlinux --- jjb/nonrtric/nonrtric.yaml | 42 ++---------------------------------------- 1 file changed, 2 insertions(+), 40 deletions(-) diff --git a/jjb/nonrtric/nonrtric.yaml b/jjb/nonrtric/nonrtric.yaml index 108d9e9f..8ba7d410 100644 --- a/jjb/nonrtric/nonrtric.yaml +++ b/jjb/nonrtric/nonrtric.yaml @@ -39,8 +39,8 @@ - dawn: branch: dawn -# nonrtric:a1-policy-management-service -# Maven artifacts for nonrtric-a1-policy-management-service +# nonrtric:a1-policy-management-service/ +# Maven artifacts for nonrtric-a1-policy-management-service/ - project: <<: *nonrtric_jdk_common name: nonrtric-a1-policy-management-service/ @@ -59,25 +59,6 @@ stream: - master: branch: master - -# nonrtric:policy-agent -# Maven artifacts for nonrtric-policy-agent -- project: - <<: *nonrtric_jdk_common - name: nonrtric-policy-agent - project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f policy-agent' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'policy-agent/.*' - build-node: ubuntu1804-builder-4c-4g - jobs: - - gerrit-maven-verify - - gerrit-maven-merge - - gerrit-maven-stage - - gerrit-maven-clm - stream: - cherry: branch: cherry - dawn: @@ -128,25 +109,6 @@ stream: - master: branch: master - -# nonrtric:enrichment-coordinator-service -# Maven artifacts for nonrtric-enrichment-coordinator-service -- project: - <<: *nonrtric_jdk_common - name: nonrtric-enrichment-coordinator-service - project-name: '{name}' - mvn-opts: '-Ddocker.skip=true' - mvn-params: '-f enrichment-coordinator-service' - gerrit_trigger_file_paths: - - compare-type: REG_EXP - pattern: 'enrichment-coordinator-service/.*' - build-node: ubuntu1804-builder-4c-4g - jobs: - - gerrit-maven-verify - - gerrit-maven-merge - - gerrit-maven-stage - - gerrit-maven-clm - stream: - cherry: branch: cherry - dawn: -- 2.16.6