Commit 5fc75f0e authored by Lu Xu's avatar Lu Xu 👀

Update Release Candidate

parents 84a0cd37 8772b31f
......@@ -6,8 +6,8 @@ extends =
[jq]
recipe = slapos.recipe.cmmi
url = https://github.com/stedolan/jq/releases/download/jq-1.6/jq-1.6.tar.gz
md5sum = e68fbd6a992e36f1ac48c99bbf825d6b
url = https://github.com/jqlang/jq/releases/download/jq-1.7/jq-1.7.tar.gz
md5sum = 4662fd45f0b5622382fc85c1249739d5
shared = true
configure-options =
--with-oniguruma=${oniguruma:location}
......
......@@ -4,6 +4,6 @@ parts =
[oniguruma]
recipe = slapos.recipe.cmmi
url = https://github.com/kkos/oniguruma/releases/download/v6.9.6/onig-6.9.6.tar.gz
md5sum = 4759064e1a6c23e764fa6918c700ecbd
url = https://github.com/kkos/oniguruma/releases/download/v6.9.8/onig-6.9.8.tar.gz
md5sum = ceb0ce338e6ad444615c1daac1e260a7
shared = true
......@@ -104,12 +104,17 @@ md5sum = 9d7b9cc850464d60ac174787c53e8f3f
[debian-amd64-bullseye-netinst.iso]
<= debian-amd64-netinst-base
version = 11.1.0
md5sum = b710c178eb434d79ce40ce703d30a5f0
version = 11.7.0
md5sum = b33775a9ab6eae784b6da9f31be48be3
[debian-amd64-bookworm-netinst.iso]
<= debian-amd64-netinst-base
version = 12.1.0
md5sum = 8d77d1b0bcfef29e4d56dc0fbe23de15
alternate-url = https://cdimage.debian.org/cdimage/release/current/${:arch}/iso-cd/${:filename}
[debian-amd64-netinst.iso]
<= debian-amd64-bullseye-netinst.iso
<= debian-amd64-bookworm-netinst.iso
[debian-amd64-testing-netinst.iso]
<= debian-amd64-netinst-base
......
[buildout]
extends =
../jq/buildout.cfg
../libsecret/buildout.cfg
../pkgconfig/buildout.cfg
../patchelf/buildout.cfg
......
......@@ -32,7 +32,6 @@ import pathlib
import socket
import struct
import subprocess
import time
import typing
import urllib.parse
......
......@@ -10,9 +10,8 @@ import tempfile
import time
import urllib.parse
from http.server import BaseHTTPRequestHandler
from unittest import mock
import OpenSSL.SSL
import pexpect
import psutil
import requests
......@@ -21,11 +20,11 @@ from cryptography.hazmat.backends import default_backend
from cryptography.hazmat.primitives import hashes, serialization
from cryptography.hazmat.primitives.asymmetric import rsa
from cryptography.x509.oid import NameOID
from slapos.testing.testcase import ManagedResource
from slapos.testing.utils import (CrontabMixin, ManagedHTTPServer,
findFreeTCPPort)
from slapos.testing.utils import CrontabMixin, ManagedHTTPServer, findFreeTCPPort
from . import ERP5InstanceTestCase, setUpModule, matrix, default
from . import ERP5InstanceTestCase, default, matrix, setUpModule
setUpModule # pyflakes
......
......@@ -37,19 +37,18 @@ import socket
import sqlite3
import ssl
import subprocess
import sys
import tempfile
import time
import unittest
import urllib.parse
import xmlrpc.client
import psutil
import requests
import urllib.parse
import xmlrpc.client
import urllib3
from slapos.testing.utils import CrontabMixin
from . import ERP5InstanceTestCase, setUpModule, matrix, default, neo
from . import ERP5InstanceTestCase, default, matrix, neo, setUpModule
setUpModule # pyflakes
......
......@@ -25,28 +25,21 @@
#
##############################################################################
import os
import json
import glob
import urllib.parse
import socket
import sys
import time
import contextlib
import datetime
import subprocess
import glob
import gzip
import json
import lzma
import os
import subprocess
import urllib.parse
import MySQLdb
from slapos.testing.utils import CrontabMixin
from slapos.testing.utils import getPromisePluginParameterDict
from slapos.testing.utils import CrontabMixin, getPromisePluginParameterDict
from . import ERP5InstanceTestCase
from . import setUpModule
from . import matrix
from . import default
from . import ERP5InstanceTestCase, default, matrix, setUpModule
setUpModule # pyflakes
......
......@@ -22,9 +22,11 @@ import unittest
from slapos.grid.utils import md5digest
from . import ERP5InstanceTestCase, setUpModule as _setUpModule
from . import ERP5InstanceTestCase
from . import setUpModule as _setUpModule
from .test_erp5 import TestPublishedURLIsReachableMixin
# skip tests when software release is built with wendelin.core 1.
def setUpModule():
_setUpModule()
......
......@@ -109,7 +109,7 @@ eggs =
[cli-utilities]
PATH = ${nodejs:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:${tig:location}/bin:${vim:location}/bin:${tmux:location}/bin:${git:location}/bin:${curl:location}/bin:${python:location}/bin:${buildout:bin-directory}
PATH = ${jq:location}/bin:${nodejs:location}/bin:${bash:location}/bin:${fish-shell:location}/bin:${tig:location}/bin:${vim:location}/bin:${tmux:location}/bin:${git:location}/bin:${curl:location}/bin:${python:location}/bin:${buildout:bin-directory}
[python-with-eggs]
recipe = zc.recipe.egg
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment