#418 fixup cloud config (26->27) and script
Merged 6 years ago by mohanboddu. Opened 6 years ago by dustymabe.
dustymabe/pungi-fedora dusty-f27  into  f27

file modified
+6 -6
@@ -12,11 +12,11 @@ 

  SKIP_PHASES="--skip-phase=productimg --skip-phase=pkgset --skip-phase=gather --skip-phase=extra_files --skip-phase=creatrepo"

  DEST=$(pwd)

  DATE=$(date "+%Y%m%d")

- DIST="26"

- BRANCHED="26"

+ DIST="27"

+ BRANCHED="27"

  BRANCH="branched"

- COMPSFILE="comps-f26.xml"

- GIT_BRANCH="f26"

+ COMPSFILE="comps-f27.xml"

+ GIT_BRANCH="f27"

  TMPDIR=`mktemp -d /tmp/$DIST.$DATE.XXXX`

  TOMAIL="devel@lists.fedoraproject.org test@lists.fedoraproject.org"

  FROM="Fedora Branched Report <rawhide@fedoraproject.org>"
@@ -24,7 +24,7 @@ 

  ATOMIC=$(mktemp -d /tmp/atomic.${DIST}.$DATE.XXXX)

  ATOMICREPO="/mnt/koji/compose/atomic/$BRANCHED/"

  ATOMICDEST="/mnt/koji/atomic/$BRANCHED/"

- OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)

+ OLDCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-27/COMPOSE_ID)

  # uncomment and edit for resuming a failed compose

  #COMPOSE_ID="Fedora-23-20150530.n.0"

  # assume a releng dir is a git checkout of the releng repo
@@ -62,7 +62,7 @@ 

  if [ "$?" = "0" ]; then

     export mail=0

  fi

- NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-26/COMPOSE_ID)

+ NEWCOMPOSE_ID=$(cat $TARGET_DIR/latest-Fedora-27/COMPOSE_ID)

  SHORTCOMPOSE_ID=$(echo $NEWCOMPOSE_ID|sed -e 's|Fedora-.*-||g')

  # Set this to use later for a few items include depcheck

  DESTDIR=$TARGET_DIR/$NEWCOMPOSE_ID

file modified
+12 -12
@@ -207,19 +207,19 @@ 

              'image-build': {

                      'format': [('qcow2','qcow2'), ('raw-xz','raw.xz')],

                      'name': 'Fedora-Cloud-Base',

-                     'target': 'f26',

-                     'version': '26',

+                     'target': 'f27',

+                     'version': '27',

                      'release': None,

-                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',

+                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27',

                      'kickstart': 'fedora-cloud-base.ks',

                      'distro': 'Fedora-22',

                      'disk_size': 4,

                      'arches': ['x86_64'],

                      'repo': [

-                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',

-                         'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',

+                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/27/$arch/',

+                         'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/',

                      ],

-                     'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',

+                     'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/',

                      'subvariant': 'Cloud_Base'

                       }

          },
@@ -227,19 +227,19 @@ 

              'image-build': {

                      'format': [('vagrant-libvirt','vagrant-libvirt.box'), ('vagrant-virtualbox','vagrant-virtualbox.box')]

                      'name': 'Fedora-Cloud-Base-Vagrant',

-                     'target': 'f26',

-                     'version': '26',

+                     'target': 'f27',

+                     'version': '27',

                      'release': None,

-                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f26',

+                     'ksurl': 'git+https://pagure.io/fedora-kickstarts.git?#origin/f27',

                      'kickstart': 'fedora-cloud-base-vagrant.ks',

                      'distro': 'Fedora-22',

                      'disk_size': 40,

                      'arches': ['x86_64'],

                      'repo': [

-                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/26/$arch/',

-                         'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/'

+                         'http://kojipkgs.fedoraproject.org/pub/fedora/linux/updates/27/$arch/',

+                         'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/'

                      ],

-                     'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/26/Cloud/$arch/os/',

+                     'install_tree_from': 'http://kojipkgs.fedoraproject.org/pub/alt/releases/27/Cloud/$arch/os/',

                      'subvariant': 'Cloud_Base',

                       }

          },

rebased onto b58781d

6 years ago

NOTE: We will not have f27 cloud images from this nightly compose as f27 is not released yet. This is just the prep work for getting ready after F27 GA release.

Pull-Request has been merged by mohanboddu

6 years ago
Metadata