From 1185e023b5ef4f63de60a4df7f4cfaf2ed41b2cc Mon Sep 17 00:00:00 2001 From: Brenna Hewer-Darroch Date: Fri, 13 Mar 2020 10:28:23 -0700 Subject: [PATCH] change manifest manifest i used didn't have the --skip-policy-migration option on the upgrade-to-v2 command so now we're using the v2 GA release manifest Signed-off-by: Brenna Hewer-Darroch --- .../old_manifests/20200127203438.json | 58 +++++++++++++++++++ .../iam_v2_no_legacy_to_v2_force_upgrade.sh | 4 +- 2 files changed, 60 insertions(+), 2 deletions(-) create mode 100644 components/automate-deployment/testdata/old_manifests/20200127203438.json diff --git a/components/automate-deployment/testdata/old_manifests/20200127203438.json b/components/automate-deployment/testdata/old_manifests/20200127203438.json new file mode 100644 index 000000000000..5a626c1c2b03 --- /dev/null +++ b/components/automate-deployment/testdata/old_manifests/20200127203438.json @@ -0,0 +1,58 @@ +{ + "schema_version": "1", + "hab_build": "core/hab/0.90.6/20191112141314", + "build": "20200127203438", + "hab": [ + "core/hab/0.90.6/20191112141314", + "core/hab-sup/0.90.6/20191112144831", + "core/hab-launcher/12605/20191112144831" + ], + "git_sha": "7f60624468e5a1bef0c97e259bb9584d77c8836b", + "packages": [ + "chef/applications-service/1.0.0/20200124224700", + "chef/authn-service/0.1.0/20200116172807", + "chef/authz-service/0.1.0/20200123224306", + "chef/automate-builder-api-proxy/0.1.0/20200116172549", + "chef/automate-builder-api/0.1.0/20200116172550", + "chef/automate-builder-memcached/1.5.19/20191213155031", + "chef/automate-chef-io/0.1.0/20200127203210", + "chef/automate-cli/0.1.0/20200127203210", + "chef/automate-cs-bookshelf/13.0.47/20200116172605", + "chef/automate-cs-nginx/13.0.47/20191211135046", + "chef/automate-cs-oc-bifrost/13.0.47/20200116172605", + "chef/automate-cs-oc-erchef/13.0.47/20200116172605", + "chef/automate-dex/0.1.0/20200116172759", + "chef/automate-elasticsearch/6.8.3/20191217225932", + "chef/automate-es-gateway/0.1.0/20200116172742", + "chef/automate-gateway/0.1.0/20200124224700", + "chef/automate-load-balancer/0.1.0/20191220184028", + "chef/automate-minio/0.1.0/20200116172549", + "chef/automate-pg-gateway/0.0.1/20191115161408", + "chef/automate-postgresql/9.6.11/20190409151101", + "chef/automate-prometheus/0.1.0/20191115161408", + "chef/automate-ui/2.0.0/20200126232616", + "chef/automate-workflow-nginx/2.8.61/20200115202531", + "chef/automate-workflow-server/2.8.61/20200116173311", + "chef/backup-gateway/0.1.0/20200116172819", + "chef/cereal-service/0.1.0/20200116172549", + "chef/compliance-service/1.11.1/20200123224306", + "chef/config-mgmt-service/0.1.0/20200123224437", + "chef/data-feed-service/1.0.0/20200122184156", + "chef/data-lifecycle-service/0.0.1/20191101111721", + "chef/deployment-service/0.1.0/20200127203210", + "chef/es-sidecar-service/1.0.0/20200116171921", + "chef/event-feed-service/1.0.0/20200116172911", + "chef/event-gateway/0.1.0/20200116172737", + "chef/event-service/0.1.0/20200123224521", + "chef/ingest-service/0.1.0/20200122184114", + "chef/license-control-service/1.0.0/20200126022722", + "chef/local-user-service/0.1.0/20200122195518", + "chef/nodemanager-service/1.0.0/20200123224437", + "chef/notifications-service/1.0.0/20200116172550", + "chef/pg-sidecar-service/0.0.1/20200116172742", + "chef/secrets-service/1.0.0/20200116172641", + "chef/session-service/0.1.0/20200116172633", + "chef/teams-service/0.1.0/20200116172550", + "core/rsync/3.1.3/20190909001447" + ] +} diff --git a/integration/tests/iam_v2_no_legacy_to_v2_force_upgrade.sh b/integration/tests/iam_v2_no_legacy_to_v2_force_upgrade.sh index b97fac95c11e..a84ff373424e 100644 --- a/integration/tests/iam_v2_no_legacy_to_v2_force_upgrade.sh +++ b/integration/tests/iam_v2_no_legacy_to_v2_force_upgrade.sh @@ -26,8 +26,8 @@ test_upgrade_inspec_profiles=(a2-deploy-integration a2-iam-no-legacy-integration # Note: we can't run diagnostics AND inspec, so skip diagnostics test_skip_diagnostics=true -# on this version, Automate had upgrade-to-v2 and the first three v2 data migrations -OLD_VERSION=20190501153509 +# on this version, we released IAM v2 GA +OLD_VERSION=20200127203438 OLD_MANIFEST_DIR="${A2_ROOT_DIR}/components/automate-deployment/testdata/old_manifests/" DEEP_UPGRADE_PATH="${OLD_MANIFEST_DIR}/${OLD_VERSION}.json"