canonical-ubuntu-qa team mailing list archive

[Tim Andersson <mp+443984@xxxxxxxxxxxxxxxxxx>]

Tim Andersson has proposed merging ~andersson123/auto-upgrade-testing-specifications:add_lunar_mantic_profiles into auto-upgrade-testing-specifications:main.

Commit message:
Remove task package for ubuntu-unity lunar->mantic

Requested reviews:
  Canonical Platform QA Team (canonical-platform-qa)

For more details, see:
https://code.launchpad.net/~andersson123/auto-upgrade-testing-specifications/+git/auto-upgrade-testing-specifications/+merge/443984

Remove task package for ubuntu-unity lunar->mantic
-- 
Your team Canonical Platform QA Team is requested to review the proposed merge of ~andersson123/auto-upgrade-testing-specifications:add_lunar_mantic_profiles into auto-upgrade-testing-specifications:main.

diff --git a/profiles/ubuntu-lunar-mantic-ubuntu-unity-amd64_qemu.yaml b/profiles/ubuntu-lunar-mantic-ubuntu-unity-amd64_qemu.yaml
index 5d7850d..c4d6d27 100644
--- a/profiles/ubuntu-lunar-mantic-ubuntu-unity-amd64_qemu.yaml
+++ b/profiles/ubuntu-lunar-mantic-ubuntu-unity-amd64_qemu.yaml
@@ -6,7 +6,11 @@
     flavor: ubuntu-unity
     image_name: lunar_mantic_ubuntu_unity_desktop_amd64.img
     build_args:
+<<<<<<< profiles/ubuntu-lunar-mantic-ubuntu-unity-amd64_qemu.yaml
       - "--post-command 'sudo apt-get -y update && sudo apt-get -y dist-upgrade && sudo DEBIAN_FRONTEND=noninteractive apt-get -y install ubuntu-unity-desktop^' -v --timeout 14400" 
+=======
+      - "--post-command 'sudo apt-get -y update && sudo apt-get -y dist-upgrade && sudo DEBIAN_FRONTEND=noninteractive apt-get -y install ubuntu-unity-desktop' -v --timeout 14400" 
+>>>>>>> profiles/ubuntu-lunar-mantic-ubuntu-unity-amd64_qemu.yaml
     releases:
       - "lunar"
       - "mantic"