DAOS-4494 build: Update to 1.0 final

Jenkinsfile

@@ -40,4 +40,5 @@
 // I.e. for testing library changes
 //@Library(value="pipeline-lib@your_branch") _
 
-packageBuildingPipelineDAOS()
+// Ubuntu needs some work
+packageBuildingPipelineDAOS(['distros' : ['centos7', 'leap15']])

Makefile

@@ -1,6 +1,4 @@
 NAME    := argobots
 SRC_EXT := gz
-SOURCE  = https://github.com/pmodels/$(NAME)/releases/download/v$(VERSION)/$(NAME)-$(VERSION).tar.$(SRC_EXT)
-PATCHES  = $(NAME)-9d48af0840.patch $(NAME)-9d48af0840...89507c1f8c.patch
 
 include packaging/Makefile_packaging.mk

argobots.spec

@@ -1,14 +1,11 @@
 Name: argobots
-Version: 1.0rc1
-Release: 4%{?dist}
+Version: 1.0
+Release: 1%{?dist}
 Summary: Lightweight, low-level threading and tasking framework
 Group: System Environment/Libraries
 License: GPLv2 or BSD
 Url: http://www.argobots.org/
-#Source: https://api.github.com/repos/pmodels/$(NAME)/tarball/31703b1
 Source: https://github.com/pmodels/%{name}/releases/download/v%{version}/%{name}-%{version}.tar.gz
-Patch1: %{name}-9d48af0840.patch
-Patch2: %{name}-9d48af0840...89507c1f8c.patch
 
 BuildRequires: pkgconfig
 
@@ -98,6 +95,9 @@ rm -f %{buildroot}%{_libdir}/*.la
 %{_includedir}/*
 
 %changelog
+* Wed May 27 2020 Brian J. Murrell <[email protected]> - 1.0-1
+- Update to 1.0 final release
+
 * Sat Sep 21 2019 Brian J. Murrell <[email protected]> - 1.0rc-4
 - Add BR: pkgconfig
 

debian/changelog

@@ -1,3 +1,9 @@
+argobots (1.0-1) unstable; urgency=medium
+  [ Brian J. Murrell ]
+  * Update to 1.0 final
+
+ -- Brian J. Murrell <[email protected]>  Wed, 27 May 2020 12:00:59 -0400
+
 argobots (1.0~rc1-2) unstable; urgency=medium
 
   [ Brian J. Murrell ]

packaging/Dockerfile.coverity

@@ -0,0 +1,32 @@
+#
+# Copyright 2018-2019, Intel Corporation
+#
+# 'recipe' for Docker to build for a Coverity scan.
+#
+
+# Pull base image
+FROM fedora:latest
+MAINTAINER daos-stack <[email protected]>
+
+# use same UID as host and default value of 1000 if not specified
+ARG UID=1000
+
+# Install basic tools
+RUN dnf -y install mock make rpm-build curl createrepo rpmlint redhat-lsb-core \
+                   git python-srpm-macros rpmdevtools
+RUN dnf -y makecache && dnf -y install gcc
+
+# Add build user (to keep rpmbuild happy)
+ENV USER build
+ENV PASSWD build
+RUN useradd -u $UID -ms /bin/bash $USER
+RUN echo "$USER:$PASSWD" | chpasswd
+# add the user to the mock group so it can run mock
+RUN usermod -a -G mock $USER
+
+# mock in Docker needs to use the old-chroot option
+RUN grep use_nspawn || \
+    echo "config_opts['use_nspawn'] = False" >> /etc/mock/site-defaults.cfg
+
+RUN chmod g+w /etc/mock/*
+

packaging/Dockerfile.mockbuild

@@ -12,8 +12,9 @@ MAINTAINER daos-stack <[email protected]>
 ARG UID=1000
 
 # Install basic tools
-RUN yum install -y mock make rpm-build curl createrepo rpmlint redhat-lsb-core \
-                   git python-srpm-macros
+RUN dnf -y install mock\ \<\ 2 mock-core-configs\ \<\ 32 make \
+                   rpm-build curl createrepo rpmlint redhat-lsb-core git \
+                   python-srpm-macros rpmdevtools
 
 # Add build user (to keep rpmbuild happy)
 ENV USER build
@@ -27,4 +28,4 @@ RUN usermod -a -G mock $USER
 RUN grep use_nspawn || \
     echo "config_opts['use_nspawn'] = False" >> /etc/mock/site-defaults.cfg
 
-RUN chmod g+w /etc/mock/*
+RUN chmod g+w /etc/mock/*

packaging/Makefile_distro_vars.mk

@@ -0,0 +1,82 @@
+# Find out what we are
+ID_LIKE := $(shell . /etc/os-release; echo $$ID_LIKE)
+# Of course that does not work for SLES-12
+ID := $(shell . /etc/os-release; echo $$ID)
+VERSION_ID := $(shell . /etc/os-release; echo $$VERSION_ID)
+ifeq ($(ID_LIKE),debian)
+UBUNTU_VERS := $(shell . /etc/os-release; echo $$VERSION)
+ifeq ($(VERSION_ID),19.04)
+# Bug - distribution is set to "devel"
+DISTRO_ID_OPT = --distribution disco
+endif
+DISTRO_ID := ubuntu$(VERSION_ID)
+DISTRO_BASE = $(basename UBUNTU_$(VERSION_ID))
+VERSION_ID_STR := $(subst $(DOT),_,$(VERSION_ID))
+endif
+ifeq ($(ID),fedora)
+SPECTOOL    := spectool
+# a Fedora-based mock builder
+# derive the the values of:
+# VERSION_ID (i.e. 7)
+# DISTRO_ID (i.e. el7)
+# DISTRO_BASE (i.e. EL_7)
+# from the CHROOT_NAME
+ifeq ($(CHROOT_NAME),epel-7-x86_64)
+DIST        := $(shell rpm $(COMMON_RPM_ARGS) --eval %{?dist})
+VERSION_ID  := 7
+DISTRO_ID   := el7
+DISTRO_BASE := EL_7
+SED_EXPR    := 1s/$(DIST)//p
+endif
+ifeq ($(CHROOT_NAME),epel-8-x86_64)
+DIST        := $(shell rpm $(COMMON_RPM_ARGS) --eval %{?dist})
+VERSION_ID  := 8
+DISTRO_ID   := el8
+DISTRO_BASE := EL_8
+SED_EXPR    := 1s/$(DIST)//p
+endif
+ifeq ($(CHROOT_NAME),opensuse-leap-15.1-x86_64)
+VERSION_ID  := 15.1
+DISTRO_ID   := sl15.1
+DISTRO_BASE := LEAP_15
+SED_EXPR    := 1p
+endif
+ifeq ($(CHROOT_NAME),leap-42.3-x86_64)
+# TBD if support is ever resurrected
+endif
+ifeq ($(CHROOT_NAME),sles-12.3-x86_64)
+# TBD if support is ever resurrected
+endif
+endif
+ifeq ($(ID),centos)
+DISTRO_ID := el$(VERSION_ID)
+DISTRO_BASE := $(basename EL_$(VERSION_ID))
+DIST        := $(shell rpm $(COMMON_RPM_ARGS) --eval %{?dist})
+SED_EXPR    := 1s/$(DIST)//p
+SPECTOOL    := spectool
+define install_repo
+	if yum-config-manager --add-repo=$(1); then                  \
+	    repo_file=$$(ls -tar /etc/yum.repos.d/*.repo | tail -1); \
+	    sed -i -e 1d -e '$$s/^/gpgcheck=False/' $$repo_file;     \
+	else                                                         \
+	    exit 1;                                                  \
+	fi
+endef
+endif
+ifeq ($(findstring opensuse,$(ID)),opensuse)
+ID_LIKE := suse
+DISTRO_ID := sl$(VERSION_ID)
+DISTRO_BASE := $(basename LEAP_$(VERSION_ID))
+endif
+ifeq ($(ID),sles)
+# SLES-12 or 15 detected.
+ID_LIKE := suse
+DISTRO_ID := sle$(VERSION_ID)
+DISTRO_BASE := $(basename SLES_$(VERSION_ID))
+endif
+ifeq ($(ID_LIKE),suse)
+SPECTOOL    := rpmdev-spectool
+define install_repo
+	zypper --non-interactive ar $(1)
+endef
+endif