AM 1.17.0 + SS 0.23.0

* Upgrade pre-commit dependencies * Update test scripts * Update version references
artefactual-labs · Dec 5, 2024 · 599078c · 599078c
1 parent 273ce2e
commit 599078c
Show file tree

Hide file tree

Showing 15 changed files with 19 additions and 19 deletions.
diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
@@ -1,13 +1,13 @@
 repos:
 - repo: https://github.com/pre-commit/pre-commit-hooks
-  rev: v4.5.0
+  rev: v5.0.0
   hooks:
   - id: check-json
   - id: check-yaml
   - id: end-of-file-fixer
   - id: trailing-whitespace
 - repo: https://github.com/igorshubovych/markdownlint-cli
-  rev: v0.39.0
+  rev: v0.42.0
   hooks:
   - id: markdownlint
 - repo: https://github.com/thlorenz/doctoc

diff --git a/README.md b/README.md
@@ -21,7 +21,7 @@ may be a bit different between packages, but the most common are `BRANCH`,
 So in order to build a specific branch or version, this command can be used from
 the folder of the package we want to build:
 
-    make BRANCH=qa/1.x VERSION=1.16.0 RELEASE=rc5
+    make BRANCH=qa/1.x VERSION=1.17.0 RELEASE=rc5
 
 Keep in mind that the makefiles are a bit recursive, they will invoke Docker,
 mount the current folder, and run the deb-build target.

diff --git a/debs/focal/.Jenkinsci b/debs/focal/.Jenkinsci
@@ -5,7 +5,7 @@ pipeline {
   string(defaultValue: 'qa/1.x', description: '', name: 'BRANCH')
   string(defaultValue: '', description: '', name: 'GIT_REPO')
   string(defaultValue: '0F4A4D31', description: 'For production packages, use production key', name: 'GPG_ID')
-  string(defaultValue: '1.16.0', description: '', name: 'VERSION')
+  string(defaultValue: '1.17.0', description: '', name: 'VERSION')
   string(defaultValue: '-beta1', description: '', name: 'RELEASE')
   string(defaultValue: 'qa/1.x', description: '', name: 'PACKBUILD_BRANCH')
   string(defaultValue: 'jenkinsci', description: '', name: 'REPOSITORY')

diff --git a/debs/jammy/.Jenkinsci b/debs/jammy/.Jenkinsci
@@ -5,7 +5,7 @@ pipeline {
   string(defaultValue: 'qa/1.x', description: '', name: 'BRANCH')
   string(defaultValue: '', description: '', name: 'GIT_REPO')
   string(defaultValue: '0F4A4D31', description: 'For production packages, use production key', name: 'GPG_ID')
-  string(defaultValue: '1.16.0', description: '', name: 'VERSION')
+  string(defaultValue: '1.17.0', description: '', name: 'VERSION')
   string(defaultValue: '-beta1', description: '', name: 'RELEASE')
   string(defaultValue: 'qa/1.x', description: '', name: 'PACKBUILD_BRANCH')
   string(defaultValue: 'jenkinsci', description: '', name: 'REPOSITORY')

diff --git a/debs/jammy/archivematica-storage-service/Makefile b/debs/jammy/archivematica-storage-service/Makefile
@@ -5,7 +5,7 @@ DOCKER_VOLUME = "/src"
 DOCKER_IMAGE  = "debbuild-$(NAME)-$(PACKAGE)-$(VERSION)"
 GPG_ID        ?= 0F4A4D31
 BRANCH        ?= qa/0.x
-VERSION       ?= 0.22.0
+VERSION       ?= 0.23.0
 RELEASE       ?= -1
 GIT_REPO      = "https://github.com/artefactual/archivematica-storage-service"
 

diff --git a/debs/jammy/archivematica/Makefile b/debs/jammy/archivematica/Makefile
@@ -5,7 +5,7 @@ DOCKER_VOLUME = "/src"
 DOCKER_IMAGE  = "debbuild-$(NAME)-$(PACKAGE)-$(VERSION)"
 GPG_ID        ?= 0F4A4D31
 BRANCH        ?= qa/1.x
-VERSION       ?= 1.16.0
+VERSION       ?= 1.17.0
 RELEASE       ?= -1
 GIT_REPO      ?= "https://github.com/artefactual"
 

diff --git a/debs/jammy/archivematica/debian-MCPClient/control b/debs/jammy/archivematica/debian-MCPClient/control
@@ -11,7 +11,7 @@ Package: archivematica-mcp-client
 Architecture: amd64
 Depends:
 	${misc:Depends},
-	archivematica-common (>= 1.16.0),
+	archivematica-common (>= 1.17.0),
 	atool,
 	bulk-extractor,
 	clamav,

diff --git a/debs/jammy/archivematica/debian-MCPServer/control b/debs/jammy/archivematica/debian-MCPServer/control
@@ -11,7 +11,7 @@ Package: archivematica-mcp-server
 Architecture: amd64
 Depends:
 	${misc:Depends},
-	archivematica-common (>= 1.16.0),
+	archivematica-common (>= 1.17.0),
 	dbconfig-common,
 	dbconfig-mysql,
 	mysql-server,

diff --git a/debs/jammy/archivematica/debian-archivematicaCommon/control b/debs/jammy/archivematica/debian-archivematicaCommon/control
@@ -13,6 +13,6 @@ Depends:
 	${misc:Depends},
 	python3,
 	python3-distutils,
-	archivematica (>= 1.16.0)
+	archivematica (>= 1.17.0)
 Description: Archivematica shared libraries.
 Homepage: https://www.archivematica.org
diff --git a/debs/jammy/archivematica/debian-dashboard/control b/debs/jammy/archivematica/debian-dashboard/control
@@ -12,7 +12,7 @@ Architecture: any
 Depends:
 	${shlibs:Depends},
 	${misc:Depends},
-	archivematica-common (>= 1.16.0),
+	archivematica-common (>= 1.17.0),
 	git,
 	nginx,
 	gettext

diff --git a/rpms/EL9/.Jenkinsci b/rpms/EL9/.Jenkinsci
@@ -4,7 +4,7 @@ pipeline {
   string(defaultValue: 'archivematica', description: '', name: 'PACKAGE')
   string(defaultValue: 'qa/1.x', description: '', name: 'BRANCH')
   string(defaultValue: '0F4A4D31', description: 'For production packages, use production key', name: 'GPG_ID')
-  string(defaultValue: '1.16.0', description: '', name: 'VERSION')
+  string(defaultValue: '1.17.0', description: '', name: 'VERSION')
   string(defaultValue: 'beta1', description: '', name: 'RELEASE')
   string(defaultValue: '', description: '', name: 'GIT_REPO')
   string(defaultValue: 'qa/1.x', description: '', name: 'PACKBUILD_BRANCH')

diff --git a/rpms/EL9/archivematica-storage-service/Makefile b/rpms/EL9/archivematica-storage-service/Makefile
@@ -1,6 +1,6 @@
 NAME          = archivematica-storage-service
 BRANCH        ?= qa/0.x
-VERSION       ?= 0.22.0
+VERSION       ?= 0.23.0
 RELEASE       ?= 1
 RPM_TOPDIR    = "/rpmbuild"
 DOCKER_VOLUME = "/src"

diff --git a/rpms/EL9/archivematica/Makefile b/rpms/EL9/archivematica/Makefile
@@ -1,6 +1,6 @@
 PACKAGE ?= archivematica
 BRANCH ?= qa/1.x
-VERSION ?= 1.16.0
+VERSION ?= 1.17.0
 RELEASE ?= 1
 RPM_TOPDIR = "/rpmbuild"
 DOCKER_VOLUME = "/src"

diff --git a/tests/archivematica/EL9/install.sh b/tests/archivematica/EL9/install.sh
@@ -46,7 +46,7 @@ else
     sudo -u root bash -c 'cat << EOF > /etc/yum.repos.d/archivematica.repo
 [archivematica]
 name=archivematica
-baseurl=https://packages.archivematica.org/1.16.x/rocky9
+baseurl=https://packages.archivematica.org/1.17.x/rocky9
 gpgcheck=1
 gpgkey=https://packages.archivematica.org/GPG-KEY-archivematica-sha512
 enabled=1
@@ -56,7 +56,7 @@ fi
 sudo -u root bash -c 'cat << EOF >> /etc/yum.repos.d/archivematica-extras.repo
 [archivematica-extras]
 name=archivematica-extras
-baseurl=https://packages.archivematica.org/1.16.x/rocky9-extras
+baseurl=https://packages.archivematica.org/1.17.x/rocky9-extras
 gpgcheck=1
 gpgkey=https://packages.archivematica.org/GPG-KEY-archivematica-sha512
 enabled=1

diff --git a/tests/archivematica/jammy/install.sh b/tests/archivematica/jammy/install.sh
@@ -39,15 +39,15 @@ sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-serv
 sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/mysql/app-pass password demo-am"
 sudo debconf-set-selections <<< "archivematica-mcp-server archivematica-mcp-server/app-password-confirm password demo-am"
 
-curl -fsSL https://packages.archivematica.org/1.16.x/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/archivematica-1.16.x.gpg
-sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.16.x.gpg] http://packages.archivematica.org/1.16.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-externals.list'
+curl -fsSL https://packages.archivematica.org/1.17.x/key.asc | sudo gpg --dearmor -o /etc/apt/keyrings/archivematica-1.17.x.gpg
+sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.17.x.gpg] http://packages.archivematica.org/1.17.x/ubuntu-externals jammy main" > /etc/apt/sources.list.d/archivematica-externals.list'
 
 if [ "${local_repository}" == "true" ] ; then
     sudo -u root bash -c 'cat << EOF > /etc/apt/sources.list.d/archivematica.list
 deb file:/am-packbuild/debs/jammy/_deb_repository ./
 EOF'
 else
-    sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.16.x.gpg] http://packages.archivematica.org/1.16.x/ubuntu jammy main" > /etc/apt/sources.list.d/archivematica.list'
+    sudo sh -c 'echo "deb [arch=amd64 signed-by=/etc/apt/keyrings/archivematica-1.17.x.gpg] http://packages.archivematica.org/1.17.x/ubuntu jammy main" > /etc/apt/sources.list.d/archivematica.list'
 fi
 
 sudo apt-get -o Acquire::AllowInsecureRepositories=true update