Arvados-DCO-1.1-Signed-off-by: Tom Clegg <tom@curii.com>
"github.com/sirupsen/logrus"
)
"github.com/sirupsen/logrus"
)
-type buildPackage struct{}
-func (bld buildPackage) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
+func (bld build) RunCommand(prog string, args []string, stdin io.Reader, stdout, stderr io.Writer) int {
logger := ctxlog.New(stderr, "text", "info")
err := (&builder{
PackageVersion: "0.0.0",
logger := ctxlog.New(stderr, "text", "info")
err := (&builder{
PackageVersion: "0.0.0",
flag.StringVar(&buildimage, "test.buildimage", "debian:10", "docker image to use when running buildpackage")
}
flag.StringVar(&buildimage, "test.buildimage", "debian:10", "docker image to use when running buildpackage")
}
-type BuildpackageSuite struct{}
+type BuildSuite struct{}
-var _ = check.Suite(&BuildpackageSuite{})
+var _ = check.Suite(&BuildSuite{})
func Test(t *testing.T) { check.TestingT(t) }
func Test(t *testing.T) { check.TestingT(t) }
-func (s *BuildpackageSuite) TestBuildAndInstall(c *check.C) {
+func (s *BuildSuite) TestBuildAndInstall(c *check.C) {
if testing.Short() {
c.Skip("skipping docker tests in short mode")
} else if _, err := exec.Command("docker", "info").CombinedOutput(); err != nil {
if testing.Short() {
c.Skip("skipping docker tests in short mode")
} else if _, err := exec.Command("docker", "info").CombinedOutput(); err != nil {
cmd = exec.Command("docker", "run", "--rm",
"-v", tmpdir+"/pkg:/pkg",
cmd = exec.Command("docker", "run", "--rm",
"-v", tmpdir+"/pkg:/pkg",
- "-v", tmpdir+"/bin/arvados-dev:/arvados-dev:ro",
+ "-v", tmpdir+"/bin/arvados-package:/arvados-package:ro",
"-v", srctree+":/usr/local/src/arvados:ro",
buildimage,
"-v", srctree+":/usr/local/src/arvados:ro",
buildimage,
- "/arvados-dev", "buildpackage",
+ "/arvados-package", "build",
"-package-version", "0.9.99",
"-source", "/usr/local/src/arvados",
"-output-directory", "/pkg")
"-package-version", "0.9.99",
"-source", "/usr/local/src/arvados",
"-output-directory", "/pkg")
err = cmd.Run()
c.Assert(err, check.IsNil)
err = cmd.Run()
c.Assert(err, check.IsNil)
- fi, err := os.Stat(tmpdir + "/pkg/arvados-server_0.9.99_amd64.deb")
+ fi, err := os.Stat(tmpdir + "/pkg/arvados-server-easy_0.9.99_amd64.deb")
c.Assert(err, check.IsNil)
c.Logf("%#v", fi)
}
c.Assert(err, check.IsNil)
c.Logf("%#v", fi)
}
"-version": cmd.Version,
"--version": cmd.Version,
"-version": cmd.Version,
"--version": cmd.Version,
- "buildpackage": buildPackage{},
-buildimage=arvados-buildpackage-${osbase}
+buildimage=arvados-package-build-${osbase}
if [[ "${opts[force-buildimage]}" || -z "$(docker images --format {{.Repository}} "${buildimage}")" ]]; then
(
echo >&2 building arvados-server...
if [[ "${opts[force-buildimage]}" || -z "$(docker images --format {{.Repository}} "${buildimage}")" ]]; then
(
echo >&2 building arvados-server...
- echo >&2 building arvados-dev...
- cd cmd/arvados-dev
+ echo >&2 building arvados-package...
+ cd cmd/arvados-package
go install
)
echo >&2 building ${pkgfile}...
docker run --rm \
--tmpfs /tmp:exec,mode=01777 \
-v /tmp/pkg:/pkg \
go install
)
echo >&2 building ${pkgfile}...
docker run --rm \
--tmpfs /tmp:exec,mode=01777 \
-v /tmp/pkg:/pkg \
- -v "${GOPATH:-${HOME}/go}"/bin/arvados-dev:/arvados-dev:ro \
+ -v "${GOPATH:-${HOME}/go}"/bin/arvados-package:/arvados-package:ro \
-v "$(pwd)":/arvados:ro \
"${buildimage}" \
eatmydata \
-v "$(pwd)":/arvados:ro \
"${buildimage}" \
eatmydata \
- /arvados-dev buildpackage \
+ /arvados-package build \
-source /arvados \
-package-version "${version}" \
-output-directory /pkg
-source /arvados \
-package-version "${version}" \
-output-directory /pkg
-v ${sourcesfile}:/etc/apt/sources.list.d/arvados-local.list:ro \
--env DEBIAN_FRONTEND=noninteractive \
"${osbase}" \
-v ${sourcesfile}:/etc/apt/sources.list.d/arvados-local.list:ro \
--env DEBIAN_FRONTEND=noninteractive \
"${osbase}" \
- bash -c 'apt update && apt install -y eatmydata && eatmydata apt install -y arvados-server-easy postgresql'
+ bash -c 'apt update && apt install -y eatmydata && eatmydata apt install -y arvados-server-easy postgresql && eatmydata apt remove -y arvados-server-easy'
docker commit "${installctr}" "${installimage}"
docker rm "${installctr}"
installctr=
docker commit "${installctr}" "${installimage}"
docker rm "${installctr}"
installctr=