X-Git-Url: https://gerrit.o-ran-sc.org/r/gitweb?a=blobdiff_plain;f=jjb%2Fpti-rtp%2Fpti-rtp.yaml;h=ed4f088653e0754d6cdcd78e5aa8438e260b373c;hb=0b918f40c651e938f7b91a528a3f0f016fecf3bd;hp=ae0587500a07b6fc5591ee6d888561de1827c82a;hpb=fe18fc24d3b26263e1640b95e33c5e8112ed13e6;p=ci-management.git

diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml
index ae058750..ed4f0886 100644
--- a/jjb/pti-rtp/pti-rtp.yaml
+++ b/jjb/pti-rtp/pti-rtp.yaml
@@ -13,7 +13,7 @@
     jobs:
       - gerrit-info-yaml-verify
 
-- pti_rtp_common: &pti_rtp_common
+- _pti_rtp_common: &pti_rtp_common
     name: pti-rtp-common
     # git repo
     project: pti/rtp
@@ -24,28 +24,48 @@
     mvn-site-id: site
     # use a centos with big memory; docker not required
     build-node: centos7-docker-2c-8g
+    # use a non-recursive pattern
+    archive-artifacts: "*.log"
 
 - project:
     <<: *pti_rtp_common
     name: pti-rtp-verify
-    # runs about 40 minutes
-    build-timeout: 60
+    # runs about 50~80 minutes
+    build-timeout: 120
     script: !include-raw-escape:
-        - install-yocto-prereq-centos.sh
-        - verify-yocto.sh
+      - install-yocto-prereq-centos.sh
+      - verify-inf.sh
     jobs:
       - oran-shell-verify
 
 - project:
     <<: *pti_rtp_common
     name: pti-rtp-merge
+    # runs about 50~80 minutes
+    build-timeout: 120
+    script: !include-raw-escape:
+      - install-yocto-prereq-centos.sh
+      - verify-inf.sh
+    jobs:
+      - oran-shell-merge
+
+- project:
+    <<: *pti_rtp_common
+    name: pti-rtp-release-merge
     # demand 200GB storage
     build-node: centos7-docker-2c-8g-200g
-    # runs about 9 hours
-    build-timeout: 600
+    # runs about 48 hours
+    build-timeout: 2880
     script: !include-raw-escape:
-        - install-yocto-prereq-centos.sh
-        - build-yocto.sh
-        - upload-yocto.sh
+      - install-yocto-prereq-centos.sh
+      - build-inf.sh
+      - upload-inf.sh
     jobs:
-      - oran-shell-merge
+      - oran-shell-release
+    stream:
+      - master:
+          branch: master
+      - f-release:
+          branch: f-release
+      - g-release:
+          branch: g-release