[arvados] updated: 2.7.0-6450-gf7407ed781

[git repository hosting]

Summary of changes:
 build/package-test-dockerfiles/.gitignore |  1 -
 build/package-test-dockerfiles/Makefile   | 36 -------------------------------
 build/run-build-packages-one-target.sh    |  7 +++---
 3 files changed, 3 insertions(+), 41 deletions(-)
 delete mode 100644 build/package-test-dockerfiles/Makefile

       via  f7407ed781aa47ca98112d519dc272895df213ab (commit)
      from  0836d17b0ace473a66079f0c495f50ac92ac4d93 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.


commit f7407ed781aa47ca98112d519dc272895df213ab
Author: Brett Smith <brett.smith at curii.com>
Date:   Fri Apr 19 18:41:19 2024 -0400

    21700: Remove package-test-dockerfiles/Makefile
    
    There's zero need for it after removing RVM.
    
    Arvados-DCO-1.1-Signed-off-by: Brett Smith <brett.smith at curii.com>

diff --git a/build/package-test-dockerfiles/.gitignore b/build/package-test-dockerfiles/.gitignore
index ceee9faa15..01d69cb3de 100644
--- a/build/package-test-dockerfiles/.gitignore
+++ b/build/package-test-dockerfiles/.gitignore
@@ -1,2 +1 @@
 */generated
-common-generated/
diff --git a/build/package-test-dockerfiles/Makefile b/build/package-test-dockerfiles/Makefile
deleted file mode 100644
index 77e49c3c1f..0000000000
--- a/build/package-test-dockerfiles/Makefile
+++ /dev/null
@@ -1,36 +0,0 @@
-# Copyright (C) The Arvados Authors. All rights reserved.
-#
-# SPDX-License-Identifier: AGPL-3.0
-
-all: debian11/generated
-debian11/generated: common-generated-all
-	test -d debian11/generated || mkdir debian11/generated
-	cp -f -rlt debian11/generated common-generated/*
-
-all: debian12/generated
-debian12/generated: common-generated-all
-	test -d debian12/generated || mkdir debian12/generated
-	cp -f -rlt debian12/generated common-generated/*
-
-all: rocky8/generated
-rocky8/generated: common-generated-all
-	test -d rocky8/generated || mkdir rocky8/generated
-	cp -f -rlt rocky8/generated common-generated/*
-
-all: ubuntu2004/generated
-ubuntu2004/generated: common-generated-all
-	test -d ubuntu2004/generated || mkdir ubuntu2004/generated
-	cp -f -rlt ubuntu2004/generated common-generated/*
-
-all: ubuntu2204/generated
-ubuntu2204/generated: common-generated-all
-	test -d ubuntu2204/generated || mkdir ubuntu2204/generated
-	cp -f -rlt ubuntu2204/generated common-generated/*
-
-common-generated-all: common-generated/empty
-
-common-generated/empty: common-generated
-	touch common-generated/empty
-
-common-generated:
-	mkdir common-generated
diff --git a/build/run-build-packages-one-target.sh b/build/run-build-packages-one-target.sh
index 22d6dc43f4..b94f5be919 100755
--- a/build/run-build-packages-one-target.sh
+++ b/build/run-build-packages-one-target.sh
@@ -206,11 +206,10 @@ JENKINS_DIR=$(dirname "$(readlink -e "$0")")
 
 if [[ "$SKIP_DOCKER_BUILD" != 1 ]] ; then
     if [[ -n "$test_packages" ]]; then
-	pushd "$JENKINS_DIR/package-test-dockerfiles"
-	make "$TARGET/generated"
+	    pushd "$JENKINS_DIR/package-test-dockerfiles"
     else
-	pushd "$JENKINS_DIR/package-build-dockerfiles"
-	make "$TARGET/generated"
+	    pushd "$JENKINS_DIR/package-build-dockerfiles"
+	    make "$TARGET/generated"
     fi
 
     GOVERSION=$(grep 'const goversion =' $WORKSPACE/lib/install/deps.go |awk -F'"' '{print $2}')

-----------------------------------------------------------------------


hooks/post-receive
--