From 9368df9a74eba3d946d3c4d2496c484f0f58ce4c Mon Sep 17 00:00:00 2001 From: Samyak Jain Date: Tue, 18 Apr 2023 14:42:52 +0530 Subject: [PATCH] Update repo to remove f35 references Signed-off-by: Samyak Jain --- cloud-nightly.sh | 6 +++--- container-nightly.sh | 6 +++--- fedora-container.conf | 26 +++++++++++++------------- 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/cloud-nightly.sh b/cloud-nightly.sh index 5de4639..90e6285 100755 --- a/cloud-nightly.sh +++ b/cloud-nightly.sh @@ -13,9 +13,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-Cloud" -RELEASE="35" -RELEASE_TITLE="35" -COMPSFILE="comps-f35.xml" +RELEASE="38" +RELEASE_TITLE="38" +COMPSFILE="comps-f38.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="test-reports@lists.fedoraproject.org" FROM="Fedora Branched Report " diff --git a/container-nightly.sh b/container-nightly.sh index 8871e30..409d980 100755 --- a/container-nightly.sh +++ b/container-nightly.sh @@ -12,9 +12,9 @@ DEST=$(pwd) DATE=$(date "+%Y%m%d") # the Pungi 'shortname', which we will include in fedmsgs for disambiguation SHORT="Fedora-Docker" -RELEASE="35" -RELEASE_TITLE="35" -COMPSFILE="comps-f35.xml" +RELEASE="38" +RELEASE_TITLE="38" +COMPSFILE="comps-f38.xml" TMPDIR=`mktemp -d /tmp/$RELEASE.$DATE.XXXX` TOMAIL="test-reports@lists.fedoraproject.org" FROM="Fedora Branched Report " diff --git a/fedora-container.conf b/fedora-container.conf index a022296..f9a6918 100644 --- a/fedora-container.conf +++ b/fedora-container.conf @@ -214,10 +214,10 @@ translate_paths = [ ] # 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_version = '35' -global_target = 'f35' +global_version = '38' +global_target = 'f38' image_build = { '^Container$': [ @@ -229,18 +229,18 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 5, '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': [ - 'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/' - 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Base' }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}', + 'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}', }, }, { @@ -251,18 +251,18 @@ image_build = { 'distro': 'Fedora-22', 'disk_size': 5, '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': [ - 'https://kojipkgs.fedoraproject.org/compose/updates/f35-updates/compose/Everything/$arch/os/' - 'https://kojipkgs.fedoraproject.org/compose/35/latest-Fedora-35/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/updates/f38-updates/compose/Everything/$arch/os/' + 'https://kojipkgs.fedoraproject.org/compose/38/latest-Fedora-38/compose/Everything/$arch/os/' ], 'subvariant': 'Container_Minimal_Base', }, 'factory-parameters': { 'dockerversion': "1.10.1", 'docker_cmd': '[ "/bin/bash" ]', - 'docker_env': '[ "DISTTAG=f35container", "FGC=f35", "container=oci" ]', - 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "35"}', + 'docker_env': '[ "DISTTAG=f38container", "FGC=f38", "container=oci" ]', + 'docker_label': '{ "name": "fedora", "license": "MIT", "vendor": "Fedora Project", "version": "38"}', }, } ],