ldm versioning and build increment

Former-commit-id: 8773a0c4af
This commit is contained in:
mjames-upc 2016-02-22 14:26:15 -07:00
parent b5e5fba570
commit b0987f1e45
3 changed files with 4 additions and 4 deletions

View file

@ -8,7 +8,7 @@
%define __prelink_undo_cmd %{nil}
Name: awips2-ldm
Summary: AWIPS II LDM Distribution
Version: %{_component_version}
Version: %{_component_version}.%{_component_release}
Release: %{_ldm_version}
Group: AWIPSII
BuildRoot: /tmp

View file

@ -109,10 +109,10 @@ export rpm_end_dir="${AWIPSII_VERSION}-${AWIPSII_RELEASE}"
#mkdir -p /awips2/jenkins/build/rpms/${rpm_end_dir}
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/x86_64/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_15.1.1/x86_64/
mv ${AWIPSII_TOP_DIR}/RPMS/x86_64/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/x86_64/
fi
if [ "$(ls -A ${AWIPSII_TOP_DIR}/RPMS/noarch/)" ]; then
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_15.1.1/noarch/
mv ${AWIPSII_TOP_DIR}/RPMS/noarch/* /awips2/jenkins/build/rpms/awips2_${AWIPSII_VERSION}/noarch/
fi
END_TIME=`date "+%s"`

View file

@ -13,7 +13,7 @@ export BUILD_WORKSPACE=${BUILD_DIR}/workspace
# baseline is...
export BASELINE="${JENKINS_WORKSPACE}"
export AWIPSII_VERSION="15.1.2"
export AWIPSII_RELEASE="18"
export AWIPSII_RELEASE="5"
export AWIPSII_TOP_DIR="${BUILD_WORKSPACE}/tmp/rpms_built_dir"