davidlt/pungi-fedora
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Update repo to remove f35 references

Browse Source 
Signed-off-by: Samyak Jain <samyak.jn11@gmail.com>
This commit is contained in:
Samyak Jain 2023-04-18 14:42:52 +05:30
parent de791ad41c
commit 9368df9a74
3 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cloud-nightly.sh
View File

@ -13,9 +13,9 @@ DEST=$(pwd)
DATE=$(date "+%Y%m%d") DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-Cloud" SHORT="Fedora-Cloud"
RELEASE="35" RELEASE="38"
RELEASE_TITLE="35" RELEASE_TITLE="38"
COMPSFILE="comps-f35.xml" COMPSFILE="comps-f38.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="test-reports@lists.fedoraproject.org" TOMAIL="test-reports@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>" FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

6
container-nightly.sh
View File

@ -12,9 +12,9 @@ DEST=$(pwd)
DATE=$(date "+%Y%m%d") DATE=$(date "+%Y%m%d")
# the Pungi 'shortname', which we will include in fedmsgs for disambiguation # the Pungi 'shortname', which we will include in fedmsgs for disambiguation
SHORT="Fedora-Docker" SHORT="Fedora-Docker"
RELEASE="35" RELEASE="38"
RELEASE_TITLE="35" RELEASE_TITLE="38"
COMPSFILE="comps-f35.xml" COMPSFILE="comps-f38.xml"
TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX`
TOMAIL="test-reports@lists.fedoraproject.org" TOMAIL="test-reports@lists.fedoraproject.org"
FROM="Fedora Branched Report <rawhide@fedoraproject.org>" FROM="Fedora Branched Report <rawhide@fedoraproject.org>"

26
fedora-container.conf
View File

@ -214,10 +214,10 @@ translate_paths = [
] ]
# These will be inherited by live_media, live_images and image_build # These will be inherited by live_media, live_images and image_build
global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f35' global_ksurl = 'git+https://pagure.io/fedora-kickstarts.git?#origin/f38'
global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN' global_release = '!RELEASE_FROM_LABEL_DATE_TYPE_RESPIN'
global_version = '35' global_version = '38'
global_target = 'f35' global_target = 'f38'
image_build = { image_build = {
'^Container$': [ '^Container$': [
@ -229,18 +229,18 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/', 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/',
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/'
], ],
'subvariant': 'Container_Base' 'subvariant': 'Container_Base'
}, },
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]', 'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}',
}, },
}, },
{ {
@ -251,18 +251,18 @@ image_build = {
'distro': 'Fedora-22', 'distro': 'Fedora-22',
'disk_size': 5, 'disk_size': 5,
'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'], 'arches': ['aarch64', 'ppc64le', 's390x', 'x86_64'],
'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/', 'install_tree_from': 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/',
'repo': [ 'repo': [
'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/'
'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/'
], ],
'subvariant': 'Container_Minimal_Base', 'subvariant': 'Container_Minimal_Base',
}, },
'factory-parameters': { 'factory-parameters': {
'dockerversion': "1.10.1", 'dockerversion': "1.10.1",
'docker_cmd': '[ "/bin/bash" ]', 'docker_cmd': '[ "/bin/bash" ]',
'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]', 'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]',
'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}', 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}',
}, },
} }
], ],