Merge "Update jjb for pti-rtp project"
diff --git a/jjb/pti-rtp/build-yocto.sh b/jjb/pti-rtp/build-inf.sh
similarity index 85%
rename from jjb/pti-rtp/build-yocto.sh
rename to jjb/pti-rtp/build-inf.sh
index 5e9fbdc..3af0737 100644
--- a/jjb/pti-rtp/build-yocto.sh
+++ b/jjb/pti-rtp/build-inf.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2019 Wind River Systems, Inc.
+# Copyright (C) 2020 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
# Builds a Yocto image for real.
# Assumes prereqs have already been installed.
-echo "--> build-yocto.sh"
+echo "--> build-inf.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
@@ -25,8 +25,7 @@
dir=workspace
echo "INFO: creating workspace $dir"
mkdir $dir
-cmd="./scripts/build_oran.sh -w $dir"
+cmd="./scripts/build_inf.sh -w $dir"
echo "INFO: invoking build script: $cmd"
$cmd
-
-echo "--> build-yocto.sh ends"
+echo "--> build-inf.sh ends"
diff --git a/jjb/pti-rtp/install-yocto-prereq-centos.sh b/jjb/pti-rtp/install-yocto-prereq-centos.sh
index 55c2abc..dc2c796 100644
--- a/jjb/pti-rtp/install-yocto-prereq-centos.sh
+++ b/jjb/pti-rtp/install-yocto-prereq-centos.sh
@@ -30,4 +30,7 @@
&& sudo yum makecache \
&& sudo yum install -y $pkgs
+git config --global user.name "oran inf builder"
+git config --global user.email "oran.inf@windriver.com"
+
echo "--> install-yocto-prereq-centos.sh ends"
diff --git a/jjb/pti-rtp/pti-rtp.yaml b/jjb/pti-rtp/pti-rtp.yaml
index a3d8e9a..7a79582 100644
--- a/jjb/pti-rtp/pti-rtp.yaml
+++ b/jjb/pti-rtp/pti-rtp.yaml
@@ -34,7 +34,7 @@
build-timeout: 120
script: !include-raw-escape:
- install-yocto-prereq-centos.sh
- - verify-yocto.sh
+ - verify-inf.sh
jobs:
- oran-shell-verify
@@ -45,7 +45,7 @@
build-timeout: 120
script: !include-raw-escape:
- install-yocto-prereq-centos.sh
- - verify-yocto.sh
+ - verify-inf.sh
jobs:
- oran-shell-merge
@@ -54,11 +54,11 @@
name: pti-rtp-release-merge
# demand 200GB storage
build-node: centos7-docker-2c-8g-200g
- # runs about 18 hours
- build-timeout: 1200
+ # runs about 35 hours
+ build-timeout: 2100
script: !include-raw-escape:
- install-yocto-prereq-centos.sh
- - build-yocto.sh
- - upload-yocto.sh
+ - build-inf.sh
+ - upload-inf.sh
jobs:
- oran-shell-release
diff --git a/jjb/pti-rtp/upload-yocto.sh b/jjb/pti-rtp/upload-inf.sh
similarity index 82%
rename from jjb/pti-rtp/upload-yocto.sh
rename to jjb/pti-rtp/upload-inf.sh
index 35b4bae..d95b282 100644
--- a/jjb/pti-rtp/upload-yocto.sh
+++ b/jjb/pti-rtp/upload-inf.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2019 Wind River Systems, Inc.
+# Copyright (C) 2020 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -16,7 +16,7 @@
# Uploads a Yocto image to Nexus.
-echo "--> upload-yocto.sh"
+echo "--> upload-inf.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
@@ -41,7 +41,8 @@
# Expect ISO file: oran-image-inf-host-intel-x86-64.iso
# in build subdir: workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/
-iso="workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso"
+#iso="workspace/prj_oran-inf/tmp-glibc/deploy/images/intel-x86-64/oran-image-inf-host-intel-x86-64.iso"
+iso="workspace/prj_oran_inf_anaconda/tmp-glibc/deploy/images/intel-corei7-64/inf-image-aio-installer-intel-corei7-64.iso"
echo "INFO: copy $iso to staging directory $repo_iso_dir"
cp "$iso" "$repo_iso_dir"
@@ -49,4 +50,4 @@
echo "INFO: Upload ISO to Nexus: $cmd"
$cmd
-echo "--> upload-yocto.sh ends"
+echo "--> upload-inf.sh ends"
diff --git a/jjb/pti-rtp/verify-yocto.sh b/jjb/pti-rtp/verify-inf.sh
similarity index 85%
rename from jjb/pti-rtp/verify-yocto.sh
rename to jjb/pti-rtp/verify-inf.sh
index da13788..2d7b44b 100644
--- a/jjb/pti-rtp/verify-yocto.sh
+++ b/jjb/pti-rtp/verify-inf.sh
@@ -1,6 +1,6 @@
#!/bin/bash
-# Copyright (C) 2019 Wind River Systems, Inc.
+# Copyright (C) 2020 Wind River Systems, Inc.
#
# Licensed under the Apache License, Version 2.0 (the "License");
# you may not use this file except in compliance with the License.
@@ -17,7 +17,7 @@
# Tests creation of a Yocto image. The "-n" flag skips bitbake.
# Assumes prereqs have already been installed.
-echo "--> verify-yocto.sh"
+echo "--> verify-inf.sh"
# Ensure we fail the job if any steps fail.
set -eu -o pipefail
@@ -25,8 +25,8 @@
dir=workspace
echo "INFO: creating workspace $dir"
mkdir $dir
-cmd="./scripts/build_oran.sh -w $dir -n"
+cmd="./scripts/build_inf.sh -w $dir -n"
echo "INFO: invoking build script: $cmd"
$cmd
-echo "--> verify-yocto.sh ends"
+echo "--> verify-inf.sh ends"