RPM packaging: separate RPM and Docker architecture, fix creating Pas…

…senger source tarball
phusion · Oct 13, 2024 · c0ee4a4 · c0ee4a4
1 parent 79670c4
commit c0ee4a4
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 12 deletions.
diff --git a/dev/ci/tests/rpm/Jenkinsfile b/dev/ci/tests/rpm/Jenkinsfile
@@ -1,10 +1,11 @@
-def setupTest(enablerFlag, distribution, architecture, block) {
+def setupTest(enablerFlag, distribution, rpmArch, dockerArch, block) {
   if (enablerFlag) {
-    node("linux && ${architecture}") {
+    node("linux && ${rpmArch}") {
       withEnv([
-        "CACHE_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME}/${distribution}-${architecture}",
+        "CACHE_DIR=${env.JENKINS_HOME}/cache/${env.JOB_NAME}/${distribution}-${rpmArch}",
         "DISTRIBUTION=${distribution}",
-        "ARCHITECTURE=${architecture}"
+        "RPM_ARCH=${rpmArch}",
+        "DOCKER_ARCH=${dockerArch}"
       ], block)
     }
   } else {
@@ -48,25 +49,25 @@ pipeline {
         script {
           parallel(
             'el8 x86_64': {
-              setupTest(params.EL8, 'el8', 'x86_64') {
+              setupTest(params.EL8, 'el8', 'x86_64', 'amd64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }
             },
             'el9 x86_64': {
-              setupTest(params.EL9, 'el9', 'x86_64') {
+              setupTest(params.EL9, 'el9', 'x86_64', 'amd64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }
             },
             'el8 aarch64': {
-              setupTest(params.EL8, 'el8', 'aarch64') {
+              setupTest(params.EL8, 'el8', 'aarch64', 'arm64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }
             },
             'el9 aarch64': {
-              setupTest(params.EL9, 'el9', 'aarch64') {
+              setupTest(params.EL9, 'el9', 'aarch64', 'arm64') {
                 checkout scm
                 sh './dev/ci/tests/rpm/run'
               }

diff --git a/dev/ci/tests/rpm/run b/dev/ci/tests/rpm/run
@@ -29,7 +29,8 @@ source "./internal/lib/distro_info.sh"
 
 require_envvar WORKSPACE "$WORKSPACE"
 require_envvar DISTRIBUTION "$DISTRIBUTION"
-require_envvar ARCHITECTURE "$ARCHITECTURE"
+require_envvar RPM_ARCH "$RPM_ARCH"
+require_envvar DOCKER_ARCH "$DOCKER_ARCH"
 
 PASSENGER_ROOT="${PASSENGER_ROOT:-$WORKSPACE}"
 CACHE_DIR="${CACHE_DIR:-$WORKSPACE/cache}"
@@ -51,14 +52,16 @@ run ./build \
 	-o "$WORKSPACE/output" \
 	-p "$PASSENGER_ROOT" \
 	-d "$DISTRIBUTION" \
-	-a "$ARCHITECTURE" \
+	-a "$RPM_ARCH" \
+	-A "$DOCKER_ARCH" \
 	-R \
 	rpm:all
 run ./test \
 	-p "$PASSENGER_ROOT" \
 	-d "$WORKSPACE/output/$DISTRIBUTION" \
 	-c "$CACHE_DIR" \
 	-x "$TEST_DISTRO_NAME" \
-	-a "$ARCHITECTURE" \
+	-a "$RPM_ARCH" \
+	-A "$DOCKER_ARCH" \
 	-j \
 	$EXTRA_TEST_PARAMS
diff --git a/packaging/rpm b/packaging/rpm
+21 −12		build
+36 −51		internal/build/Rakefile
+1 −1		internal/build/build-passenger-source-tarball.sh
+1 −1		internal/build/rakefile_support.rb
+0 −17		internal/lib/build_tasks_support.rb
+0 −5		internal/lib/distro_info.rb
+1 −1		internal/test/test.sh
+15 −13		test