commit acd2259e01abae74a57c4446fdaf0390c16d8eb2 Author: Mark Korondi Date: Fri Oct 16 16:13:02 2020 +0200 2020 Virtual ediiton * Updated README * Updated pip and deb packages. * New firefox bookmark format [currently doesn't work] Change-Id: I115609d6db6b77a6812dd92aa066fb5edc4f38a1 diff --git a/CHANGELOG.md b/CHANGELOG.md index 42979f2..f15fd0e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -3,6 +3,11 @@ All notable changes to this project will be documented in this file. The format is based on [Keep a Changelog](http://keepachangelog.com/) +## [v2020.02] Virtual summit + +### Changed +- Updated pip and apt packages + ## [v2019.02] Shanghai summit ### Changed diff --git a/README.md b/README.md index 9e8997c..0cb0aa9 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,8 @@ OpenStack Upstream Institute Virtual Environment ================================================ -

bit.ly/upstream-institute

bit.ly/upstream-training

bit.ly/vm-2020-virtual-v1

Instructions ------------ @@ -92,7 +93,7 @@ Getting around in the VM 11. **IMPORTANT**: To keep your devstack environment across reboots, **do not reboot / halt the VM**, but instead use "Save the machine state" from VirtualBox quit dialog. -Devstack installs using the [99-devstack.sh](elements/upstream-training/install.d/99-devstack.sh) +Devstack installs using the [99-devstack](elements/upstream-training/install.d/99-devstack) script. Using latest devstack @@ -136,20 +137,15 @@ The image can be built using [diskimage-builder][dib] in a convenience vagrant m ``` This will boot up a VirtualBox VM with CentOS 7 -2. Install prerequisites in the VM - ```bash - ./prereqs.sh - ``` - This step needs root/sudo rights to install tools like qemu-img -3. Activate the python virtual environment +2. Activate the python virtual environment ```bash . .env/bin/activate ``` -4. Create disk image with provided convenience script +3. Create disk image with provided convenience script ```bash ./create-training-box.sh ``` -5. The generated image can be found under `dist/` +4. The generated image can be found under `dist/` [dib]: https://docs.openstack.org/diskimage-builder/latest/ diff --git a/create-training-box.sh b/create-training-box.sh index a3494a6..a8b5af2 100755 --- a/create-training-box.sh +++ b/create-training-box.sh @@ -12,6 +12,8 @@ export ELEMENTS_PATH=./elements/ mkdir -p tmp +export DIB_APT_SOURCES_CONF="cloudarchive-train:deb http://ubuntu-cloud.archive.canonical.com/ubuntu bionic-updates/train main" + DIB_OPTIONS="-o tmp/$DISK -t $FORMAT --image-size 40" if [ "$FORMAT" = "vmdk" ]; then DIB_OPTIONS="$DIB_OPTIONS --qemu-img-options subformat=streamOptimized" diff --git a/elements/upstream-training/element-deps b/elements/upstream-training/element-deps index 315fdad..e5cb64c 100644 --- a/elements/upstream-training/element-deps +++ b/elements/upstream-training/element-deps @@ -2,6 +2,6 @@ ubuntu-minimal block-device-mbr vm growroot -package-installs install-static +package-installs cleanup-kernel-initrd diff --git a/elements/upstream-training/finalise.d/99-finalise b/elements/upstream-training/finalise.d/99-finalise index 1722bf7..7ba6fe1 100755 --- a/elements/upstream-training/finalise.d/99-finalise +++ b/elements/upstream-training/finalise.d/99-finalise @@ -1,9 +1,5 @@ #!/usr/bin/env bash - -# Empty user caches set -x -rm -rf /root/.cache -rm -rf /home/ubuntu/.cache # Remove compiled pyc files updatedb diff --git a/elements/upstream-training/install.d/99-devstack b/elements/upstream-training/install.d/99-devstack index 700e569..3295486 100755 --- a/elements/upstream-training/install.d/99-devstack +++ b/elements/upstream-training/install.d/99-devstack @@ -1,23 +1,38 @@ #!/usr/bin/env bash -# # Install devstack +add-apt-repository -y cloud-archive:train +apt dist-upgrade -y + +# Install devstack git clone --depth=1 https://opendev.org/openstack/devstack \ /opt/devstack mv /tmp/local.conf /opt/devstack/ -pip install setuptools -pip install -r /tmp/requirements.txt - mkdir /opt/stack pushd /opt/stack for repo in $(cat /tmp/openstack_git_repos.txt); do git clone --depth 1 $repo done + +# Cache all the PIP packages +pip3 install setuptools wheel --upgrade + +for repo in *; do + ( + cd "$repo" || return + cat *constraints*.txt > /tmp/constraints-$repo.txt + cat global-requirements.txt requirements.txt > /tmp/requirements-$repo.txt + pip3 install -r --upgrade /tmp/requirements-$repo.txt -c /tmp/constraints-$repo.txt + rm -rf /tmp/{constraints,requirements}-$repo.txt + ) +done +pip3 install -r --upgrade /tmp/requirements.txt +rm -rf /root/.cache/pip popd pushd /opt/devstack/files/ -wget http://download.cirros-cloud.net/0.4.0/cirros-0.4.0-x86_64-disk.img +wget http://download.cirros-cloud.net/0.5.1/cirros-0.5.1-x86_64-disk.img popd # su ubuntu -c '/opt/devstack/stack.sh' diff --git a/elements/upstream-training/package-installs.yaml b/elements/upstream-training/package-installs.yaml index 172a650..04f24fa 100644 --- a/elements/upstream-training/package-installs.yaml +++ b/elements/upstream-training/package-installs.yaml @@ -9,6 +9,8 @@ isc-dhcp-client: mlocate: net-tools: python-pip: +python3-pip: +software-properties-common: # Install git workflow related software git: @@ -42,6 +44,7 @@ xserver-xorg-input-evdev: firefox: geany: hexchat: +xfce4-appfinder: xfce4-terminal: xfce4-whiskermenu-plugin: @@ -66,8 +69,8 @@ xserver-xorg-video-qxl: # This list is generated from the list of package differences between a # pre- and post-install of devstack acl: -apache2: apache2-dev: +apache2: bc: bsdmainutils: conntrack: @@ -88,6 +91,7 @@ gettext: gir1.2-libosinfo-1.0: graphviz: haproxy: +init-system-helpers: ipset: iptables: iputils-arping: @@ -95,7 +99,7 @@ iputils-ping: keepalived: kpartx: libapache2-mod-proxy-uwsgi: -libapache2-mod-wsgi: +libapache2-mod-wsgi-py3: libffi-dev: libjpeg-dev: libjs-jquery-tablesorter: @@ -107,32 +111,42 @@ libpq-dev: libsasl2-dev: libssl-dev: libsystemd-dev: +libunbound2: libvirt-clients: libvirt-daemon-system: +libvirt-daemon: libvirt-dev: +libvirt0: libxml2-dev: libxslt1-dev: libyaml-dev: lsof: +lsscsi: lvm2: make: memcached: +moreutils: mysql-server: netcat-openbsd: openssh-server: openssl: +openvswitch-common: openvswitch-switch: parted: pkg-config: pm-utils: postgresql-server-dev-all: psmisc: -python-dev: -python-gdbm: -python-mysqldb: -python-psutil: -python-virtualenv: -python2.7: +python3-dev: +python3-mysqldb: +python3-netifaces: +python3-openvswitch: +python3-sortedcontainers: +python3-venv: +python3.6-dev: +python3.6: +qemu-block-extra: +qemu-system-common: qemu-system: qemu-utils: rabbitmq-server: @@ -144,8 +158,12 @@ sysfsutils: tcpdump: tgt: thin-provisioning-tools: +ubuntu-cloud-keyring: unzip: uuid-runtime: +uwsgi-plugin-python3: +uwsgi-plugin-python: +uwsgi: vlan: wget: zlib1g-dev: diff --git a/elements/upstream-training/pre-install.d/99-debconf b/elements/upstream-training/pre-install.d/99-debconf index c0e1fb8..90fa862 100755 --- a/elements/upstream-training/pre-install.d/99-debconf +++ b/elements/upstream-training/pre-install.d/99-debconf @@ -2,4 +2,3 @@ sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password password openstack' sudo debconf-set-selections <<< 'mysql-server mysql-server/root_password_again password openstack' - diff --git a/elements/upstream-training/static/home/ubuntu/.config/hexchat/servlist_.conf b/elements/upstream-training/static/home/ubuntu/.config/hexchat/servlist_.conf index 73d6414..6bb4aff 100644 --- a/elements/upstream-training/static/home/ubuntu/.config/hexchat/servlist_.conf +++ b/elements/upstream-training/static/home/ubuntu/.config/hexchat/servlist_.conf @@ -1,6 +1,6 @@ N=FreeNode J=#openstack-dev -E=IRC (Latin/Unicode Hybrid) -F=19 +E=UTF-8 +F=23 D=0 -S=irc.freenode.net/6667 +S=irc.freenode.net/6697 diff --git a/elements/upstream-training/static/home/ubuntu/.config/xfce4/terminal/terminalrc b/elements/upstream-training/static/home/ubuntu/.config/xfce4/terminal/terminalrc index b6758ef..a1bfe24 100644 --- a/elements/upstream-training/static/home/ubuntu/.config/xfce4/terminal/terminalrc +++ b/elements/upstream-training/static/home/ubuntu/.config/xfce4/terminal/terminalrc @@ -3,3 +3,4 @@ ShortcutsNoMenukey=TRUE ColorPalette=#000000;#cc0000;#4e9a06;#c4a000;#3465a4;#75507b;#06989a;#d3d7cf;#555753;#ef2929;#8ae234;#fce94f;#739fcf;#ad7fa8;#34e2e2;#eeeeec ShortcutsNoMnemonics=TRUE FontName=Monospace 9 +ScrollingUnlimited=TRUE diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/places.sql b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/places.sql new file mode 100644 index 0000000..749aa04 --- /dev/null +++ b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/places.sql @@ -0,0 +1,67 @@ +PRAGMA foreign_keys=OFF; +BEGIN TRANSACTION; +CREATE TABLE moz_origins ( id INTEGER PRIMARY KEY, prefix TEXT NOT NULL, host TEXT NOT NULL, frecency INTEGER NOT NULL, UNIQUE (prefix, host) ); +INSERT INTO moz_origins VALUES(7,'http://','localhost',-134); +INSERT INTO moz_origins VALUES(9,'https://','opendev.org',57); +INSERT INTO moz_origins VALUES(11,'https://','docs.openstack.org',-134); +CREATE TABLE moz_places ( id INTEGER PRIMARY KEY, url LONGVARCHAR, title LONGVARCHAR, rev_host LONGVARCHAR, visit_count INTEGER DEFAULT 0, hidden INTEGER DEFAULT 0 NOT NULL, typed INTEGER DEFAULT 0 NOT NULL, frecency INTEGER DEFAULT -1 NOT NULL, last_visit_date INTEGER , guid TEXT, foreign_count INTEGER DEFAULT 0 NOT NULL, url_hash INTEGER DEFAULT 0 NOT NULL , description TEXT, preview_image_url TEXT, origin_id INTEGER REFERENCES moz_origins(id)); +INSERT INTO moz_places VALUES(13,'http://localhost/dashboard/auth/login/?next=/dashboard/','Login - OpenStack Dashboard','tsohlacol.',0,0,0,-1,NULL,'T1avrkk79Bcy',1,125509329257445,NULL,NULL,7); +INSERT INTO moz_places VALUES(21,'https://opendev.org/openstack/upstream-institute-virtual-environment#user-content-getting-around-in-the-vm','openstack/upstream-institute-virtual-environment: A VirtualBox image that has all the tools needed to begin OpenStack upstream contribution - upstream-institute-virtual-environment - OpenDev: Free Software Needs Free Tools','gro.vednepo.',0,0,0,-1,NULL,'jeTn2YGMmTYX',1,47358254921276,'A VirtualBox image that has all the tools needed to begin OpenStack upstream contribution','https://opendev.org/user/avatar/openstack/-1',9); +INSERT INTO moz_places VALUES(23,'https://docs.openstack.org/upstream-training/','OpenStack Docs: OpenStack Upstream Institute','gro.kcatsnepo.scod.',0,0,0,-1,NULL,'Ss-objjt0p6Y',1,47357000276702,NULL,NULL,11); +CREATE TABLE moz_historyvisits ( id INTEGER PRIMARY KEY, from_visit INTEGER, place_id INTEGER, visit_date INTEGER, visit_type INTEGER, session INTEGER); +CREATE TABLE moz_inputhistory ( place_id INTEGER NOT NULL, input LONGVARCHAR NOT NULL, use_count INTEGER, PRIMARY KEY (place_id, input)); +CREATE TABLE moz_bookmarks ( id INTEGER PRIMARY KEY, type INTEGER, fk INTEGER DEFAULT NULL, parent INTEGER, position INTEGER, title LONGVARCHAR, keyword_id INTEGER, folder_type TEXT, dateAdded INTEGER, lastModified INTEGER, guid TEXT, syncStatus INTEGER NOT NULL DEFAULT 0, syncChangeCounter INTEGER NOT NULL DEFAULT 1); +INSERT INTO moz_bookmarks VALUES(1,2,NULL,0,0,'',NULL,NULL,1602831047211000,1602831185097000,'root________',1,1); +INSERT INTO moz_bookmarks VALUES(2,2,NULL,1,0,'menu',NULL,NULL,1602831047211000,1602831064957000,'menu________',1,5); +INSERT INTO moz_bookmarks VALUES(3,2,NULL,1,1,'toolbar',NULL,NULL,1602831047211000,1602831185097000,'toolbar_____',1,7); +INSERT INTO moz_bookmarks VALUES(4,2,NULL,1,2,'tags',NULL,NULL,1602831047211000,1602831047211000,'tags________',1,1); +INSERT INTO moz_bookmarks VALUES(5,2,NULL,1,3,'unfiled',NULL,NULL,1602831047211000,1602831155979000,'unfiled_____',1,6); +INSERT INTO moz_bookmarks VALUES(6,2,NULL,1,4,'mobile',NULL,NULL,1602831047225000,1602831047883000,'mobile______',1,2); +INSERT INTO moz_bookmarks VALUES(7,1,13,3,1,'DevStack dashboard',NULL,NULL,1602831084610000,1602831098067000,'dBaxGDdxd3_3',1,3); +INSERT INTO moz_bookmarks VALUES(8,1,21,3,0,'VM help',NULL,NULL,1602831143349000,1602831155979000,'NmU33M707NBI',1,3); +INSERT INTO moz_bookmarks VALUES(9,1,23,3,2,'Upstream Institute',NULL,NULL,1602831185097000,1602831192441000,'kWXf2DouR7K9',1,2); +CREATE TABLE moz_bookmarks_deleted ( guid TEXT PRIMARY KEY, dateRemoved INTEGER NOT NULL DEFAULT 0); +CREATE TABLE moz_keywords ( id INTEGER PRIMARY KEY AUTOINCREMENT, keyword TEXT UNIQUE, place_id INTEGER, post_data TEXT); +CREATE TABLE moz_anno_attributes ( id INTEGER PRIMARY KEY, name VARCHAR(32) UNIQUE NOT NULL); +CREATE TABLE moz_annos ( id INTEGER PRIMARY KEY, place_id INTEGER NOT NULL, anno_attribute_id INTEGER, content LONGVARCHAR, flags INTEGER DEFAULT 0, expiration INTEGER DEFAULT 0, type INTEGER DEFAULT 0, dateAdded INTEGER DEFAULT 0, lastModified INTEGER DEFAULT 0); +CREATE TABLE moz_items_annos ( id INTEGER PRIMARY KEY, item_id INTEGER NOT NULL, anno_attribute_id INTEGER, content LONGVARCHAR, flags INTEGER DEFAULT 0, expiration INTEGER DEFAULT 0, type INTEGER DEFAULT 0, dateAdded INTEGER DEFAULT 0, lastModified INTEGER DEFAULT 0); +CREATE TABLE moz_meta (key TEXT PRIMARY KEY, value NOT NULL) WITHOUT ROWID ; +INSERT INTO moz_meta VALUES('origin_frecency_count',1); +INSERT INTO moz_meta VALUES('origin_frecency_sum',56.999999999999999998); +INSERT INTO moz_meta VALUES('origin_frecency_sum_of_squares',3248.9999999999999999); +ANALYZE sqlite_master; +INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_originidindex','23 3'); +INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_guid_uniqueindex','23 1'); +INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_lastvisitdateindex','23 2'); +INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_frecencyindex','23 4'); +INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_visitcount','23 8'); +INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_hostindex','23 3'); +INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_url_hashindex','23 1'); +INSERT INTO sqlite_stat1 VALUES('moz_historyvisits','moz_historyvisits_dateindex','17 1'); +INSERT INTO sqlite_stat1 VALUES('moz_historyvisits','moz_historyvisits_fromindex','17 2'); +INSERT INTO sqlite_stat1 VALUES('moz_historyvisits','moz_historyvisits_placedateindex','17 2 1'); +INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_guid_uniqueindex','9 1'); +INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_dateaddedindex','9 2'); +INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_itemlastmodifiedindex','9 3 2'); +INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_parentindex','9 3 1'); +INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_itemindex','9 3 3'); +DELETE FROM sqlite_sequence; +CREATE INDEX moz_places_url_hashindex ON moz_places (url_hash); +CREATE INDEX moz_places_hostindex ON moz_places (rev_host); +CREATE INDEX moz_places_visitcount ON moz_places (visit_count); +CREATE INDEX moz_places_frecencyindex ON moz_places (frecency); +CREATE INDEX moz_places_lastvisitdateindex ON moz_places (last_visit_date); +CREATE UNIQUE INDEX moz_places_guid_uniqueindex ON moz_places (guid); +CREATE INDEX moz_places_originidindex ON moz_places (origin_id); +CREATE INDEX moz_historyvisits_placedateindex ON moz_historyvisits (place_id, visit_date); +CREATE INDEX moz_historyvisits_fromindex ON moz_historyvisits (from_visit); +CREATE INDEX moz_historyvisits_dateindex ON moz_historyvisits (visit_date); +CREATE INDEX moz_bookmarks_itemindex ON moz_bookmarks (fk, type); +CREATE INDEX moz_bookmarks_parentindex ON moz_bookmarks (parent, position); +CREATE INDEX moz_bookmarks_itemlastmodifiedindex ON moz_bookmarks (fk, lastModified); +CREATE INDEX moz_bookmarks_dateaddedindex ON moz_bookmarks (dateAdded); +CREATE UNIQUE INDEX moz_bookmarks_guid_uniqueindex ON moz_bookmarks (guid); +CREATE UNIQUE INDEX moz_keywords_placepostdata_uniqueindex ON moz_keywords (place_id, post_data); +CREATE UNIQUE INDEX moz_annos_placeattributeindex ON moz_annos (place_id, anno_attribute_id); +CREATE UNIQUE INDEX moz_items_annos_itemattributeindex ON moz_items_annos (item_id, anno_attribute_id); +COMMIT; diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/prefs.js b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/prefs.js new file mode 100644 index 0000000..9f442c5 --- /dev/null +++ b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/prefs.js @@ -0,0 +1,22 @@ +user_pref("app.normandy.first_run", false); +user_pref("app.normandy.migrationsApplied", 10); +user_pref("app.normandy.startupRolloutPrefs.privacy.purge_trackers.enabled", true); +user_pref("app.normandy.user_id", "ebbb49aa-aefb-446c-8b76-c660cfc0054a"); +user_pref("browser.contentblocking.category", "standard"); +user_pref("browser.laterrun.enabled", true); +user_pref("browser.migration.version", 96); +user_pref("browser.startup.homepage", "https://opendev.org/openstack/upstream-institute-virtual-environment#user-content-getting-around-in-the-vm"); +user_pref("browser.startup.homepage_override.buildID", "20200917005511"); +user_pref("browser.startup.homepage_override.mstone", "81.0"); +user_pref("browser.tabs.warnOnClose", false); +user_pref("distribution.iniFile.exists.appversion", "81.0"); +user_pref("distribution.iniFile.exists.value", true); +user_pref("extensions.databaseSchema", 32); +user_pref("extensions.getAddons.databaseSchema", 6); +user_pref("extensions.incognito.migrated", true); +user_pref("extensions.lastAppVersion", "81.0"); +user_pref("extensions.lastPlatformVersion", "81.0"); +user_pref("signon.usage.hasEntry", false); +user_pref("storage.vacuum.last.index", 0); +user_pref("toolkit.telemetry.reportingpolicy.firstRun", false); +user_pref("trailhead.firstrun.didSeeAboutWelcome", true); diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/xulstore.json b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/xulstore.json new file mode 100644 index 0000000..d17e2ea --- /dev/null +++ b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/default-release/xulstore.json @@ -0,0 +1 @@ +{"chrome://browser/content/browser.xul":{"PersonalToolbar":{"collapsed":"false"}}} diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/installs.ini b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/installs.ini new file mode 100644 index 0000000..fcf5ed6 --- /dev/null +++ b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/installs.ini @@ -0,0 +1,3 @@ +[4F96D1932A9F858E] +Default=default-release +Locked=1 diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/places.sql b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/places.sql deleted file mode 100644 index ce03406..0000000 --- a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/places.sql +++ /dev/null @@ -1,102 +0,0 @@ -PRAGMA foreign_keys=OFF; -PRAGMA page_size=32768; -PRAGMA journal_mode=WAL; -PRAGMA user_version=38; -BEGIN TRANSACTION; -CREATE TABLE moz_places ( id INTEGER PRIMARY KEY, url LONGVARCHAR, title LONGVARCHAR, rev_host LONGVARCHAR, visit_count INTEGER DEFAULT 0, hidden INTEGER DEFAULT 0 NOT NULL, typed INTEGER DEFAULT 0 NOT NULL, favicon_id INTEGER, frecency INTEGER DEFAULT -1 NOT NULL, last_visit_date INTEGER , guid TEXT, foreign_count INTEGER DEFAULT 0 NOT NULL, url_hash INTEGER DEFAULT 0 NOT NULL, description TEXT, preview_image_url TEXT); -INSERT INTO moz_places VALUES(2,'http://www.ubuntu.com/',NULL,'moc.utnubu.www.',0,0,0,NULL,-1,NULL,'nTfgGRo9Uesq',1,125508050257634,NULL,NULL); -INSERT INTO moz_places VALUES(3,'http://wiki.ubuntu.com/',NULL,'moc.utnubu.ikiw.',0,0,0,NULL,-1,NULL,'uULgJcd36ITo',1,125511519733047,NULL,NULL); -INSERT INTO moz_places VALUES(4,'https://answers.launchpad.net/ubuntu/+addquestion',NULL,'ten.daphcnual.srewsna.',0,0,0,NULL,-1,NULL,'5yeTocQzamO8',1,47359338650210,NULL,NULL); -INSERT INTO moz_places VALUES(5,'http://www.debian.org/',NULL,'gro.naibed.www.',0,0,0,NULL,-1,NULL,'s4Wx-371Qgni',1,125508165346216,NULL,NULL); -INSERT INTO moz_places VALUES(6,'https://one.ubuntu.com/',NULL,'moc.utnubu.eno.',0,0,0,NULL,-1,NULL,'6G5pOs0N02pU',1,47359195550374,NULL,NULL); -INSERT INTO moz_places VALUES(7,'https://www.mozilla.org/en-US/firefox/help/',NULL,'gro.allizom.www.',0,0,0,NULL,-1,NULL,'BzfdxOHoIDBg',1,47356364765622,NULL,NULL); -INSERT INTO moz_places VALUES(8,'https://www.mozilla.org/en-US/firefox/customize/',NULL,'gro.allizom.www.',0,0,0,NULL,-1,NULL,'VEJradmZ4POo',1,47357014640010,NULL,NULL); -INSERT INTO moz_places VALUES(9,'https://www.mozilla.org/en-US/contribute/',NULL,'gro.allizom.www.',0,0,0,NULL,-1,NULL,'HVNV0Vd2XGh_',1,47358034485371,NULL,NULL); -INSERT INTO moz_places VALUES(10,'https://www.mozilla.org/en-US/about/',NULL,'gro.allizom.www.',0,0,0,NULL,-1,NULL,'1AmdXdQ_qAx-',1,47358774953055,NULL,NULL); -INSERT INTO moz_places VALUES(12,'place:type=6&sort=14&maxResults=10',NULL,'.',0,0,0,NULL,0,NULL,'w6GszjQOvXeX',1,268505606444332,NULL,NULL); -INSERT INTO moz_places VALUES(17,'http://docs.openstack.org/upstream-training',NULL,'gro.kcatsnepo.scod.',0,0,1,NULL,-1,NULL,'BUZg9pAqNoFi',1,125508174841766,NULL,NULL); -INSERT INTO moz_places VALUES(18,'http://bit.ly/upstream-institute','OpenStack Docs: OpenStack Upstream Training','gro.kcatsnepo.scod.',0,0,0,NULL,-1,NULL,'4WyU1BiaJ_2Z',1,125508050713050,NULL,NULL); -INSERT INTO moz_places VALUES(21,'http://localhost/dashboard','Login - OpenStack Dashboard','4.05.861.291.',0,0,0,NULL,-1,NULL,'jQmTHM8YPPVl',1,125508424363628,NULL,NULL); -CREATE TABLE moz_historyvisits ( id INTEGER PRIMARY KEY, from_visit INTEGER, place_id INTEGER, visit_date INTEGER, visit_type INTEGER, session INTEGER); -CREATE TABLE moz_inputhistory ( place_id INTEGER NOT NULL, input LONGVARCHAR NOT NULL, use_count INTEGER, PRIMARY KEY (place_id, input)); -INSERT INTO moz_inputhistory VALUES(17,'docs.op',1); -CREATE TABLE moz_hosts ( id INTEGER PRIMARY KEY, host TEXT NOT NULL UNIQUE, frecency INTEGER, typed INTEGER NOT NULL DEFAULT 0, prefix TEXT); -INSERT INTO moz_hosts VALUES(1,'mozilla.org',140,0,NULL); -INSERT INTO moz_hosts VALUES(2,'ubuntu.com',140,0,NULL); -INSERT INTO moz_hosts VALUES(3,'wiki.ubuntu.com',140,0,NULL); -INSERT INTO moz_hosts VALUES(4,'answers.launchpad.net',140,0,NULL); -INSERT INTO moz_hosts VALUES(5,'debian.org',140,0,NULL); -INSERT INTO moz_hosts VALUES(6,'one.ubuntu.com',140,0,NULL); -INSERT INTO moz_hosts VALUES(11,'docs.openstack.org',210,1,NULL); -INSERT INTO moz_hosts VALUES(12,'192.168.50.4',2000,1,NULL); -CREATE TABLE moz_bookmarks ( id INTEGER PRIMARY KEY, type INTEGER, fk INTEGER DEFAULT NULL, parent INTEGER, position INTEGER, title LONGVARCHAR, keyword_id INTEGER, folder_type TEXT, dateAdded INTEGER, lastModified INTEGER, guid TEXT, syncStatus INTEGER DEFAULT 0 NOT NULL, syncChangeCounter INTEGER DEFAULT 1 NOT NULL); -INSERT INTO moz_bookmarks VALUES(1,2,NULL,0,0,'',NULL,NULL,1476547376102000,1476547379306000,'root________',0,1); -INSERT INTO moz_bookmarks VALUES(2,2,NULL,1,0,'Bookmarks Menu',NULL,NULL,1476547376102000,1476547379306000,'menu________',0,1); -INSERT INTO moz_bookmarks VALUES(3,2,NULL,1,1,'Bookmarks Toolbar',NULL,NULL,1476547376102000,1476547434464000,'toolbar_____',0,1); -INSERT INTO moz_bookmarks VALUES(4,2,NULL,1,2,'Tags',NULL,NULL,1476547376102000,1476547376102000,'tags________',0,1); -INSERT INTO moz_bookmarks VALUES(5,2,NULL,1,3,'Other Bookmarks',NULL,NULL,1476547376102000,1476547377301000,'unfiled_____',0,1); -INSERT INTO moz_bookmarks VALUES(7,2,NULL,2,2,'Ubuntu and Free Software links',NULL,NULL,1476547377309000,1476547377321000,'zQ1vRiKCRLIu',0,1); -INSERT INTO moz_bookmarks VALUES(8,1,2,7,0,'Ubuntu',NULL,NULL,1476547377310000,1476547377311000,'AnSEmZAW7Xpk',0,1); -INSERT INTO moz_bookmarks VALUES(9,1,3,7,1,'Ubuntu Wiki (community-edited website)',NULL,NULL,1476547377312000,1476547377314000,'ErWiTzeEp2_A',0,1); -INSERT INTO moz_bookmarks VALUES(10,1,4,7,2,'Make a Support Request to the Ubuntu Community',NULL,NULL,1476547377316000,1476547377318000,'NjHXLeNbfodn',0,1); -INSERT INTO moz_bookmarks VALUES(11,1,5,7,3,'Debian (Ubuntu is based on Debian)',NULL,NULL,1476547377319000,1476547377321000,'_M0Wa_Iuoyrt',0,1); -INSERT INTO moz_bookmarks VALUES(12,1,6,7,4,'Ubuntu One - The personal cloud that brings your digital life together',NULL,NULL,1476547377321000,1476547377322000,'Rr484VNjn4Ur',0,1); -INSERT INTO moz_bookmarks VALUES(13,2,NULL,2,3,'Mozilla Firefox',NULL,NULL,1476547377323000,1476547377335000,'4Mw9jItoG1YT',0,1); -INSERT INTO moz_bookmarks VALUES(14,1,7,13,0,'Help and Tutorials',NULL,NULL,1476547377324000,1476547377325000,'IabGCL8kiSzW',0,1); -INSERT INTO moz_bookmarks VALUES(15,1,8,13,1,'Customize Firefox',NULL,NULL,1476547377326000,1476547377329000,'s-36i80cUJ7z',0,1); -INSERT INTO moz_bookmarks VALUES(16,1,9,13,2,'Get Involved',NULL,NULL,1476547377329000,1476547377330000,'P-geYnvpgCDt',0,1); -INSERT INTO moz_bookmarks VALUES(17,1,10,13,3,'About Us',NULL,NULL,1476547377335000,1476547377353000,'uIFVJxQLe9S_',0,1); -INSERT INTO moz_bookmarks VALUES(19,1,12,2,0,'Recent Tags',NULL,NULL,1476547379066000,1476547379287000,'-V-CBc1Qbd3i',0,1); -INSERT INTO moz_bookmarks VALUES(20,3,NULL,2,1,NULL,NULL,NULL,1476547379306000,1476547379306000,'GFR46ESoBhte',0,1); -INSERT INTO moz_bookmarks VALUES(21,1,18,3,0,'VM Help',NULL,NULL,1476547385490000,1509460379409000,'po3sJZ6D_giI',0,2); -INSERT INTO moz_bookmarks VALUES(22,1,17,3,1,'Training Home',NULL,NULL,1476547408090000,1509460412626000,'u9rHgHV8nC-z',0,2); -INSERT INTO moz_bookmarks VALUES(23,1,21,3,2,'DevStack',NULL,NULL,1476547434464000,1476547439123000,'IWIbdGpefevM',0,1); -INSERT INTO moz_bookmarks VALUES(24,2,NULL,1,4,'Mobile Bookmarks',NULL,NULL,1509460348567000,1509460348567000,'mobile______',0,1); -CREATE TABLE moz_keywords ( id INTEGER PRIMARY KEY AUTOINCREMENT, keyword TEXT UNIQUE, place_id INTEGER, post_data TEXT); -CREATE TABLE moz_favicons ( id INTEGER PRIMARY KEY, url LONGVARCHAR UNIQUE, data BLOB, mime_type VARCHAR(32), expiration LONG); -CREATE TABLE moz_anno_attributes ( id INTEGER PRIMARY KEY, name VARCHAR(32) UNIQUE NOT NULL); -INSERT INTO moz_anno_attributes VALUES(1,'bookmarkProperties/description'); -INSERT INTO moz_anno_attributes VALUES(2,'Places/SmartBookmark'); -INSERT INTO moz_anno_attributes VALUES(3,'mobile/bookmarksRoot'); -CREATE TABLE moz_annos ( id INTEGER PRIMARY KEY, place_id INTEGER NOT NULL, anno_attribute_id INTEGER, mime_type VARCHAR(32) DEFAULT NULL, content LONGVARCHAR, flags INTEGER DEFAULT 0, expiration INTEGER DEFAULT 0, type INTEGER DEFAULT 0, dateAdded INTEGER DEFAULT 0, lastModified INTEGER DEFAULT 0); -CREATE TABLE moz_items_annos ( id INTEGER PRIMARY KEY, item_id INTEGER NOT NULL, anno_attribute_id INTEGER, mime_type VARCHAR(32) DEFAULT NULL, content LONGVARCHAR, flags INTEGER DEFAULT 0, expiration INTEGER DEFAULT 0, type INTEGER DEFAULT 0, dateAdded INTEGER DEFAULT 0, lastModified INTEGER DEFAULT 0); -INSERT INTO moz_items_annos VALUES(1,3,1,NULL,'Add bookmarks to this folder to see them displayed on the Bookmarks Toolbar',0,4,3,1476547377304000,1476547377304000); -INSERT INTO moz_items_annos VALUES(2,7,1,NULL,'Information and resources about Ubuntu, Debian and Free Software in general',0,4,3,1476547377309000,1476547377309000); -INSERT INTO moz_items_annos VALUES(4,19,2,NULL,'RecentTags',0,4,3,1476547379286000,1476547379286000); -INSERT INTO moz_items_annos VALUES(5,24,3,NULL,'1',0,4,1,-1612644904,-1612644904); -ANALYZE sqlite_master; -INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_guid_uniqueindex','5 1'); -INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_itemlastmodifiedindex','5 5 5'); -INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_parentindex','5 3 1'); -INSERT INTO sqlite_stat1 VALUES('moz_bookmarks','moz_bookmarks_itemindex','5 5 5'); -INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_url_hashindex','24 1'); -INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_guid_uniqueindex','24 1'); -INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_lastvisitdateindex','24 2'); -INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_frecencyindex','24 3'); -INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_visitcount','24 6'); -INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_hostindex','24 2'); -INSERT INTO sqlite_stat1 VALUES('moz_places','moz_places_faviconindex','24 24'); -INSERT INTO sqlite_stat1 VALUES('moz_historyvisits','moz_historyvisits_dateindex','18 1'); -INSERT INTO sqlite_stat1 VALUES('moz_historyvisits','moz_historyvisits_fromindex','18 2'); -INSERT INTO sqlite_stat1 VALUES('moz_historyvisits','moz_historyvisits_placedateindex','18 2 1'); -INSERT INTO sqlite_stat1 VALUES('moz_inputhistory','sqlite_autoindex_moz_inputhistory_1','1 1 1'); -CREATE TABLE moz_bookmarks_deleted ( guid TEXT PRIMARY KEY, dateRemoved INTEGER NOT NULL DEFAULT 0); -DELETE FROM sqlite_sequence; -CREATE INDEX moz_places_faviconindex ON moz_places (favicon_id); -CREATE INDEX moz_places_hostindex ON moz_places (rev_host); -CREATE INDEX moz_places_visitcount ON moz_places (visit_count); -CREATE INDEX moz_places_frecencyindex ON moz_places (frecency); -CREATE INDEX moz_places_lastvisitdateindex ON moz_places (last_visit_date); -CREATE INDEX moz_historyvisits_placedateindex ON moz_historyvisits (place_id, visit_date); -CREATE INDEX moz_historyvisits_fromindex ON moz_historyvisits (from_visit); -CREATE INDEX moz_historyvisits_dateindex ON moz_historyvisits (visit_date); -CREATE INDEX moz_bookmarks_itemindex ON moz_bookmarks (fk, type); -CREATE INDEX moz_bookmarks_parentindex ON moz_bookmarks (parent, position); -CREATE INDEX moz_bookmarks_itemlastmodifiedindex ON moz_bookmarks (fk, lastModified); -CREATE INDEX moz_places_url_hashindex ON moz_places (url_hash); -CREATE UNIQUE INDEX moz_places_guid_uniqueindex ON moz_places (guid); -CREATE UNIQUE INDEX moz_bookmarks_guid_uniqueindex ON moz_bookmarks (guid); -CREATE UNIQUE INDEX moz_keywords_placepostdata_uniqueindex ON moz_keywords (place_id, post_data); -CREATE UNIQUE INDEX moz_annos_placeattributeindex ON moz_annos (place_id, anno_attribute_id); -CREATE UNIQUE INDEX moz_items_annos_itemattributeindex ON moz_items_annos (item_id, anno_attribute_id); -COMMIT; diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/prefs.js b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/prefs.js deleted file mode 100644 index c6ab3be..0000000 --- a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/prefs.js +++ /dev/null @@ -1,106 +0,0 @@ -# Mozilla User Preferences - -/* Do not edit this file. - * - * If you make changes to this file while the application is running, - * the changes will be overwritten when the application exits. - * - * To make a manual change to preferences, you can visit the URL about:config - */ - -user_pref("app.update.lastUpdateTime.addon-background-update-timer", 1476544187); -user_pref("app.update.lastUpdateTime.blocklist-background-update-timer", 0); -user_pref("app.update.lastUpdateTime.browser-cleanup-thumbnails", 1476543827); -user_pref("app.update.lastUpdateTime.experiments-update-timer", 1476544067); -user_pref("app.update.lastUpdateTime.search-engine-update-timer", 1476543947); -user_pref("app.update.lastUpdateTime.xpi-signature-verification", 0); -user_pref("browser.bookmarks.restore_default_bookmarks", false); -user_pref("browser.cache.disk.capacity", 358400); -user_pref("browser.cache.disk.filesystem_reported", 1); -user_pref("browser.cache.disk.smart_size.first_run", false); -user_pref("browser.cache.frecency_experiment", 3); -user_pref("browser.download.importedFromSqlite", true); -user_pref("browser.laterrun.bookkeeping.profileCreationTime", 1476543707); -user_pref("browser.laterrun.bookkeeping.sessionCount", 2); -user_pref("browser.laterrun.enabled", true); -user_pref("browser.migration.version", 38); -user_pref("browser.newtabpage.enabled", false); -user_pref("browser.newtabpage.enhanced", false); -user_pref("browser.newtabpage.storageVersion", 1); -user_pref("browser.pagethumbnails.storage_version", 3); -user_pref("browser.places.smartBookmarksVersion", 8); -user_pref("browser.reader.detectedFirstArticle", true); -user_pref("browser.safebrowsing.provider.google.lastupdatetime", "1476543849041"); -user_pref("browser.safebrowsing.provider.google.nextupdatetime", "1476545704041"); -user_pref("browser.safebrowsing.provider.mozilla.lastupdatetime", "1476543716972"); -user_pref("browser.safebrowsing.provider.mozilla.nextupdatetime", "1476547316972"); -user_pref("browser.search.countryCode", "CH"); -user_pref("browser.search.region", "CH"); -user_pref("browser.sessionstore.upgradeBackup.latestBuildID", "20160919213721"); -user_pref("browser.slowStartup.averageTime", 2435); -user_pref("browser.slowStartup.samples", 2); -user_pref("browser.startup.homepage", "http://bit.ly/upstream-institute"); -user_pref("browser.startup.homepage_override.buildID", "20160919213721"); -user_pref("browser.startup.homepage_override.mstone", "49.0"); -user_pref("browser.tabs.remote.autostart.2", true); -user_pref("browser.uiCustomization.state", "{\"placements\":{\"PanelUI-contents\":[\"edit-controls\",\"zoom-controls\",\"new-window-button\",\"privatebrowsing-button\",\"save-page-button\",\"print-button\",\"history-panelmenu\",\"fullscreen-button\",\"find-button\",\"preferences-button\",\"add-ons-button\",\"developer-button\",\"sync-button\"],\"addon-bar\":[\"addonbar-closebutton\",\"status-bar\"],\"PersonalToolbar\":[\"personal-bookmarks\"],\"nav-bar\":[\"urlbar-container\",\"search-container\",\"bookmarks-menu-button\",\"downloads-button\",\"home-button\"],\"TabsToolbar\":[\"tabbrowser-tabs\",\"new-tab-button\",\"alltabs-button\"],\"toolbar-menubar\":[\"menubar-items\"]},\"seen\":[\"pocket-button\",\"developer-button\"],\"dirtyAreaCache\":[\"PersonalToolbar\",\"nav-bar\",\"TabsToolbar\",\"toolbar-menubar\",\"PanelUI-contents\",\"addon-bar\"],\"currentVersion\":6,\"newElementCount\":0}"); -user_pref("browser.urlbar.daysBeforeHidingSuggestionsPrompt", 3); -user_pref("browser.urlbar.lastSuggestionsPromptDate", 20161015); -user_pref("browser.urlbar.userMadeSearchSuggestionsChoice", true); -user_pref("datareporting.policy.dataSubmissionPolicyAcceptedVersion", 2); -user_pref("datareporting.policy.dataSubmissionPolicyNotifiedTime", "1476543769132"); -user_pref("datareporting.sessions.current.activeTicks", 16); -user_pref("datareporting.sessions.current.clean", true); -user_pref("datareporting.sessions.current.firstPaint", 2694); -user_pref("datareporting.sessions.current.main", 31); -user_pref("datareporting.sessions.current.sessionRestored", 2073); -user_pref("datareporting.sessions.current.startTime", "1476544232365"); -user_pref("datareporting.sessions.current.totalTime", 79); -user_pref("datareporting.sessions.currentIndex", 1); -user_pref("datareporting.sessions.previous.0", "{\"s\":1476543706243,\"a\":70,\"t\":522,\"c\":true,\"m\":241,\"fp\":3086,\"sr\":2894}"); -user_pref("distribution.canonical.bookmarksProcessed", true); -user_pref("dom.apps.lastUpdate.buildID", "20160919213721"); -user_pref("dom.apps.lastUpdate.mstone", "49.0"); -user_pref("dom.apps.reset-permissions", true); -user_pref("e10s.rollout.cohort", "disqualified-test"); -user_pref("e10s.rollout.cohortSample", "0.887414"); -user_pref("experiments.activeExperiment", false); -user_pref("extensions.blocklist.pingCountVersion", 0); -user_pref("extensions.bootstrappedAddons", "{\"e10srollout@mozilla.org\":{\"version\":\"1.3\",\"type\":\"extension\",\"descriptor\":\"/home/ubuntu/.mozilla/firefox/yncyd31n.default/features/{1cc1c36d-e330-42fe-8a48-6322ee32262e}/e10srollout@mozilla.org.xpi\",\"multiprocessCompatible\":false,\"runInSafeMode\":true},\"webcompat@mozilla.org\":{\"version\":\"1.0\",\"type\":\"extension\",\"descriptor\":\"/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi\",\"multiprocessCompatible\":false,\"runInSafeMode\":true},\"firefox@getpocket.com\":{\"version\":\"1.0.4\",\"type\":\"extension\",\"descriptor\":\"/usr/lib/firefox/browser/features/firefox@getpocket.com.xpi\",\"multiprocessCompatible\":false,\"runInSafeMode\":true}}"); -user_pref("extensions.databaseSchema", 17); -user_pref("extensions.e10s.rollout.hasAddon", false); -user_pref("extensions.e10s.rollout.policy", "49a"); -user_pref("extensions.e10sBlockedByAddons", true); -user_pref("extensions.enabledAddons", "ubufox%40ubuntu.com:3.2,%7B972ce4c6-7e08-4474-a285-3208198ce6fd%7D:49.0"); -user_pref("extensions.getAddons.cache.lastUpdate", 1476544189); -user_pref("extensions.getAddons.databaseSchema", 5); -user_pref("extensions.hotfix.lastVersion", "20160826.01"); -user_pref("extensions.lastAppVersion", "49.0"); -user_pref("extensions.lastPlatformVersion", "49.0"); -user_pref("extensions.pendingOperations", false); -user_pref("extensions.systemAddonSet", "{\"schema\":1,\"directory\":\"{1cc1c36d-e330-42fe-8a48-6322ee32262e}\",\"addons\":{\"e10srollout@mozilla.org\":{\"version\":\"1.3\"}}}"); -user_pref("extensions.ui.dictionary.hidden", true); -user_pref("extensions.ui.experiment.hidden", true); -user_pref("extensions.ui.lastCategory", "addons://list/service"); -user_pref("extensions.ui.locale.hidden", true); -user_pref("extensions.xpiState", "{\"app-system-addons\":{\"e10srollout@mozilla.org\":{\"d\":\"/home/ubuntu/.mozilla/firefox/yncyd31n.default/features/{1cc1c36d-e330-42fe-8a48-6322ee32262e}/e10srollout@mozilla.org.xpi\",\"e\":true,\"v\":\"1.3\",\"st\":1476544192000}},\"app-system-defaults\":{\"e10srollout@mozilla.org\":{\"d\":\"/usr/lib/firefox/browser/features/e10srollout@mozilla.org.xpi\",\"e\":false,\"v\":\"1.2\",\"st\":1474325282000},\"webcompat@mozilla.org\":{\"d\":\"/usr/lib/firefox/browser/features/webcompat@mozilla.org.xpi\",\"e\":true,\"v\":\"1.0\",\"st\":1474325282000},\"firefox@getpocket.com\":{\"d\":\"/usr/lib/firefox/browser/features/firefox@getpocket.com.xpi\",\"e\":true,\"v\":\"1.0.4\",\"st\":1474325282000}},\"app-global\":{\"{972ce4c6-7e08-4474-a285-3208198ce6fd}\":{\"d\":\"/usr/lib/firefox/browser/extensions/{972ce4c6-7e08-4474-a285-3208198ce6fd}.xpi\",\"e\":true,\"v\":\"49.0\",\"st\":1474325282000}},\"app-system-share\":{\"ubufox@ubuntu.com\":{\"d\":\"/usr/share/mozilla/extensions/{ec8030f7-c20a-464f-9b0e-13a3a9e97384}/ubufox@ubuntu.com.xpi\",\"e\":true,\"v\":\"3.2\",\"st\":1442597111000}}}"); -user_pref("media.gmp-gmpopenh264.abi", "x86_64-gcc3"); -user_pref("media.gmp-gmpopenh264.lastUpdate", 1476543775); -user_pref("media.gmp-gmpopenh264.version", "1.6"); -user_pref("media.gmp-manager.buildID", "20160919213721"); -user_pref("media.gmp-manager.lastCheck", 1476543773); -user_pref("media.gmp.storage.version.observed", 1); -user_pref("network.cookie.prefsMigrated", true); -user_pref("network.predictor.cleaned-up", true); -user_pref("pdfjs.migrationVersion", 2); -user_pref("pdfjs.previousHandler.alwaysAskBeforeHandling", true); -user_pref("places.history.expiration.transient_current_max_pages", 104858); -user_pref("plugin.disable_full_page_plugin_for_types", "application/pdf"); -user_pref("privacy.cpd.offlineApps", true); -user_pref("privacy.cpd.siteSettings", true); -user_pref("privacy.sanitize.timeSpan", 0); -user_pref("signon.importedFromSqlite", true); -user_pref("toolkit.startup.last_success", 1476544232); -user_pref("toolkit.telemetry.cachedClientID", "380c70e8-2ce9-4471-8648-77c056b5a237"); -user_pref("toolkit.telemetry.previousBuildID", "20160919213721"); -user_pref("toolkit.telemetry.reportingpolicy.firstRun", false); diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/xulstore.json b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/xulstore.json deleted file mode 100644 index d17e2ea..0000000 --- a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profile/xulstore.json +++ /dev/null @@ -1 +0,0 @@ -{"chrome://browser/content/browser.xul":{"PersonalToolbar":{"collapsed":"false"}}} diff --git a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profiles.ini b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profiles.ini index eb2a147..70fd96d 100644 --- a/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profiles.ini +++ b/elements/upstream-training/static/home/ubuntu/.mozilla/firefox/profiles.ini @@ -1,9 +1,13 @@ +[Install4F96D1932A9F858E] +Default=default-release +Locked=1 + [General] StartWithLastProfile=1 [Profile0] -Name=default +Name=default-release IsRelative=1 -Path=profile +Path=default-release Default=1 diff --git a/elements/upstream-training/static/tmp/local.conf b/elements/upstream-training/static/tmp/local.conf index 5aafd58..fd59b0e 100644 --- a/elements/upstream-training/static/tmp/local.conf +++ b/elements/upstream-training/static/tmp/local.conf @@ -13,10 +13,15 @@ SERVICE_PASSWORD=$ADMIN_PASSWORD USE_SCREEN=False USE_SYSTEMD=True +# Times change... +USE_PYTHON3=True + # Git fine tuning. HTTPS is usually enabled on firewalls. # Depth should be only one for upstream training purposes GIT_DEPTH=1 GIT_BASE=https://opendev.org +USE_PYTHON3=True + # Let's save some memory API_WORKERS=1 diff --git a/elements/upstream-training/static/tmp/openstack_git_repos.txt b/elements/upstream-training/static/tmp/openstack_git_repos.txt index 4372590..bfeeb68 100644 --- a/elements/upstream-training/static/tmp/openstack_git_repos.txt +++ b/elements/upstream-training/static/tmp/openstack_git_repos.txt @@ -1,9 +1,10 @@ -https://opendev.org/openstack/nova.git +https://github.com/novnc/noVNC.git +https://opendev.org/openstack/cinder.git +https://opendev.org/openstack/glance.git https://opendev.org/openstack/horizon.git https://opendev.org/openstack/keystone.git -https://opendev.org/openstack/cinder.git -https://github.com/novnc/noVNC.git https://opendev.org/openstack/neutron.git +https://opendev.org/openstack/nova.git +https://opendev.org/openstack/placement.git https://opendev.org/openstack/requirements.git https://opendev.org/openstack/tempest.git -https://opendev.org/openstack/glance.git diff --git a/elements/upstream-training/static/tmp/requirements.txt b/elements/upstream-training/static/tmp/requirements.txt index 5fde8de..826ad67 100644 --- a/elements/upstream-training/static/tmp/requirements.txt +++ b/elements/upstream-training/static/tmp/requirements.txt @@ -1,316 +1,204 @@ -Babel==2.7.0 -Click==7.0 -Django==1.11.25 -Flask-RESTful==0.3.7 -Flask==1.1.1 -GitPython==2.1.11 -Jinja2==2.10.3 -Mako==1.1.0 -MarkupSafe==1.1.1 -Paste==3.2.1 -PasteDeploy==2.0.1 -Pint==0.9 +Babel==2.8.0 +Django==2.2.15 +Flask-RESTful==0.3.8 +Flask==1.1.2 +Jinja2==2.11.2 +Mako==1.1.3 +Paste==3.4.3 +PasteDeploy==2.1.0 PyJWT==1.7.1 -PyMySQL==0.9.3 -PyNaCl==1.3.0 -PyYAML==5.1.2 -Pygments==2.4.2 +PyMySQL==0.10.0 +PyYAML==5.3.1 Routes==2.4.1 -SQLAlchemy==1.3.9 -Sphinx==1.8.5 -Tempita==0.5.2 -WSME==0.9.3 -WebOb==1.8.5 -WebTest==2.0.33 -Werkzeug==0.16.0 -XStatic-Angular-Bootstrap==2.2.0.0 -XStatic-Angular-FileUpload==12.0.4.0 -XStatic-Angular-Gettext==2.3.8.0 -XStatic-Angular-Schema-Form==0.8.13.0 +SQLAlchemy==1.3.19 +WSME==0.10.0 +WebOb==1.8.6 +WebTest==2.0.35 +Werkzeug==1.0.1 +XStatic-Angular-Bootstrap==2.5.0.0 +XStatic-Angular-Gettext==2.4.1.0 XStatic-Angular-lrdragndrop==1.0.2.4 -XStatic-Angular==1.5.8.0 -XStatic-Bootstrap-Datepicker==1.3.1.0 -XStatic-Bootstrap-SCSS==3.3.7.1 -XStatic-D3==3.5.17.0 -XStatic-Font-Awesome==4.7.0.0 -XStatic-Hogan==2.0.0.2 -XStatic-JQuery-Migrate==1.2.1.1 -XStatic-JQuery.TableSorter==2.14.5.1 -XStatic-JQuery.quicksearch==2.0.3.1 -XStatic-JSEncrypt==2.3.1.1 +XStatic-Bootstrap-Datepicker==1.4.0.0 +XStatic-Bootstrap-SCSS==3.4.1.0 +XStatic-Hogan==2.0.0.3 +XStatic-JQuery-Migrate==1.2.1.2 +XStatic-JQuery.TableSorter==2.14.5.2 +XStatic-JQuery.quicksearch==2.0.3.2 XStatic-Jasmine==2.4.1.2 -XStatic-Rickshaw==1.5.0.0 -XStatic-Spin==1.2.5.2 -XStatic-bootswatch==3.3.7.0 +XStatic-Rickshaw==1.5.1.0 +XStatic-Spin==1.2.5.3 XStatic-jQuery==1.12.4.1 XStatic-jquery-ui==1.12.1.1 -XStatic-mdi==1.6.50.2 -XStatic-objectpath==1.2.1.0 -XStatic-roboto-fontface==0.5.0.0 -XStatic-smart-table==1.4.13.2 -XStatic-term.js==0.0.7.0 -XStatic-tv4==1.2.7.0 XStatic==1.0.2 -alabaster==0.7.12 -alembic==1.2.1 -amqp==2.5.1 -aniso8601==8.0.0 -appdirs==1.4.3 -asn1crypto==1.0.1 -astroid==1.6.5 -atomicwrites==1.3.0 -attrs==19.2.0 -automaton==1.17.0 -backports.functools-lru-cache==1.5 -bandit==1.6.2 -bashate==0.6.0 -bcrypt==3.1.7 -beautifulsoup4==4.8.1 -cachetools==3.1.1 -castellan==1.3.1 -certifi==2019.9.11 -cffi==1.12.3 -chardet==3.0.4 -cliff==2.16.0 -cmd2==0.8.9 -colorama==0.4.1 -configparser==4.0.2 -contextlib2==0.6.0 -coverage==4.5.4 -cryptography==2.7 +alembic==1.4.2 +amqp==2.6.1 +appdirs==1.4.4 +attrs==20.1.0 +automaton==2.2.0 +bcrypt==3.2.0 +beautifulsoup4==4.9.1 +cachetools==4.1.1 +castellan==3.6.0 +certifi==2020.6.20 +cffi==1.14.2 +cliff==3.4.0 +cmd2==1.3.8 +colorama==0.4.3 +cryptography==3.1 cursive==0.2.2 -ddt==1.2.1 -debtcollector==1.22.0 -decorator==4.4.0 -defusedxml==0.6.0 -django-appconf==1.0.3 -django-babel==0.6.2 -django-compressor==2.3 -django-debreach==1.5.2 -django-pyscss==2.0.2 -dnspython==1.16.0 -doc8==0.8.0 -docutils==0.15.2 -dogpile.cache==0.8.0 -dulwich==0.19.13 -enum34==1.1.6 -etcd3==0.10.0 -etcd3gw==0.2.4 -eventlet==0.25.1 -extras==1.0.0 -fasteners==0.14.1 +dataclasses==0.7 +debtcollector==2.2.0 +decorator==4.4.2 +distlib==0.3.1 +django-appconf==1.0.4 +django-compressor==2.4 +django-debreach==2.0.1 +dogpile.cache==1.0.2 +etcd3==0.12.0 +etcd3gw==0.2.5 +eventlet==0.26.1 filelock==3.0.12 -fixtures==3.0.0 -flake8-docstrings==0.2.1.post1 -flake8-import-order==0.11 -flake8==2.6.2 -freezegun==0.3.12 -funcsigs==1.0.2 -functools32==3.2.3.post2 -future==0.17.1 -futures==3.3.0 -futurist==1.9.0 -gabbi==1.49.0 -gitdb2==2.0.6 -glance-store==1.0.1 -google-api-python-client==1.7.11 -google-auth-httplib2==0.0.3 -google-auth==1.6.3 -greenlet==0.4.15 -grpcio==1.24.1 -hacking==1.1.0 -httplib2==0.14.0 -idna==2.8 -imagesize==1.1.0 -importlib-metadata==0.23 -ipaddress==1.0.22 +futurist==2.3.0 +glance-store==2.3.0 +google-api-core==1.22.1 +google-api-python-client==1.11.0 +google-auth-httplib2==0.0.4 +google-auth==1.21.0 +googleapis-common-protos==1.52.0 +greenlet==0.4.16 +grpcio==1.31.0 +httplib2==0.18.1 +idna==2.10 +importlib-metadata==1.7.0 +importlib-resources==3.0.0 iso8601==0.1.12 -isort==4.3.21 -itsdangerous==1.1.0 -jmespath==0.9.4 -jsonpatch==1.24 -jsonpath-rw-ext==1.2.2 -jsonpath-rw==1.4.0 +jmespath==0.10.0 +jsonpatch==1.26 jsonpointer==2.0 -jsonschema==3.0.2 -keystoneauth1==3.17.1 -keystonemiddleware==7.0.1 -kombu==4.6.5 -lazy-object-proxy==1.4.2 -libvirt-python==5.7.0 -linecache2==1.0.0 -logutils==0.3.5 -lxml==4.4.1 -mccabe==0.2.1 -microversion-parse==0.2.1 -mock==3.0.5 +keystoneauth1==4.2.1 +keystonemiddleware==9.1.0 +kombu==5.0.1 +libvirt-python==6.6.0 +lxml==4.5.2 +microversion-parse==1.0.1 monotonic==1.5 -more-itertools==5.0.0 -msgpack==0.6.2 -munch==2.3.2 -mysqlclient==1.3.10 -netaddr==0.7.19 +msgpack==1.0.0 +munch==2.5.0 +netaddr==0.8.0 netifaces==0.10.9 -networkx==2.2 -neutron-lib==1.29.1 -nodeenv==1.3.3 -numpy==1.16.5 +networkx==2.5 +numpy==1.19.1 oauth2client==4.1.3 oauthlib==3.1.0 -openstackdocstheme==1.31.1 -openstacksdk==0.36.0 -os-api-ref==1.6.2 -os-brick==2.10.0 -os-client-config==1.33.0 -os-ken==0.4.1 -os-resource-classes==0.5.0 +openstacksdk==0.50.0 +os-brick==4.0.1 +os-client-config==2.1.0 +os-ken==1.2.0 +os-resource-classes==1.0.0 os-service-types==1.7.0 -os-testr==1.1.0 -os-traits==0.16.0 -os-vif==1.17.0 -os-win==4.3.2 +os-testr==2.0.0 +os-vif==2.2.0 +os-win==5.1.0 os-xenapi==0.3.4 -osc-lib==1.14.1 -osc-placement==1.7.0 -oslo.cache==1.37.0 -oslo.concurrency==3.30.0 -oslo.config==6.11.1 -oslo.context==2.23.0 -oslo.db==5.0.2 -oslo.i18n==3.24.0 -oslo.log==3.44.1 -oslo.messaging==10.2.0 -oslo.middleware==3.38.1 -oslo.policy==2.3.2 -oslo.privsep==1.33.3 -oslo.reports==1.30.0 -oslo.rootwrap==5.16.1 -oslo.serialization==2.29.2 -oslo.service==1.40.2 -oslo.upgradecheck==0.3.2 -oslo.utils==3.41.1 -oslo.versionedobjects==1.36.1 -oslo.vmware==2.34.1 -oslotest==3.8.1 -osprofiler==2.8.2 -ovs==2.11.0 -ovsdbapp==0.17.0 -packaging==19.2 -paramiko==2.6.0 -passlib==1.7.1 -pathlib2==2.3.5 -pathlib==1.0.1 -pbr==5.4.3 +osc-lib==2.2.1 +osc-placement==2.1.0 +oslo.cache==2.6.1 +oslo.concurrency==4.3.0 +oslo.config==8.3.2 +oslo.context==3.1.1 +oslo.db==8.4.0 +oslo.i18n==5.0.1 +oslo.log==4.4.0 +oslo.messaging==12.5.0 +oslo.middleware==4.1.1 +oslo.policy==3.5.0 +oslo.privsep==2.4.0 +oslo.reports==2.2.0 +oslo.rootwrap==6.2.0 +oslo.serialization==4.0.1 +oslo.service==2.4.0 +oslo.upgradecheck==1.1.1 +oslo.utils==4.6.0 +oslo.versionedobjects==2.3.0 +oslo.vmware==3.7.0 +osprofiler==3.4.0 +ovs==2.13.0 +ovsdbapp==1.5.0 +passlib==1.7.2 +pbr==5.5.0 pecan==1.3.3 -pep257==0.7.0 -pep8==1.5.7 -pluggy==0.13.0 -ply==3.11 +pluggy==0.13.1 prettytable==0.7.2 -protobuf==3.10.0 -psutil==5.6.3 -psycopg2==2.8.3 -py==1.8.0 -pyOpenSSL==19.0.0 -pyScss==1.3.4 -pyasn1-modules==0.2.6 -pyasn1==0.4.7 -pycadf==2.10.0 -pycodestyle==2.5.0 -pycparser==2.19 +protobuf==3.13.0 +psutil==5.7.2 +py==1.9.0 +pyOpenSSL==19.1.0 +pyasn1-modules==0.2.8 +pyasn1==0.4.8 +pycadf==3.1.1 +pycparser==2.20 pydot==1.4.1 -pyflakes==0.8.1 -pyinotify==0.9.6 -pylint==1.9.2 -pymongo==3.9.0 -pyparsing==2.4.2 -pyperclip==1.7.0 -pypowervm==1.1.23 -pyroute2==0.5.6 -pyrsistent==0.15.4 -pysaml2==4.8.0 -pysendfile==2.0.1 -pytest==4.6.5 -python-barbicanclient==4.9.0 -python-cinderclient==5.0.0 -python-dateutil==2.8.0 -python-designateclient==3.0.0 +pymongo==3.11.0 +pyparsing==2.4.7 +pyperclip==1.8.0 +pypowervm==1.1.24 +pyroute2==0.5.14 +pyrsistent==0.16.0 +pysaml2==6.1.0 +python-barbicanclient==5.0.1 +python-cinderclient==7.2.0 +python-dateutil==2.8.1 +python-designateclient==4.1.0 python-editor==1.0.4 -python-glanceclient==2.17.0 -python-ironicclient==3.1.0 -python-keystoneclient==3.21.0 +python-glanceclient==3.2.2 +python-keystoneclient==4.1.1 python-memcached==1.59 -python-mimeparse==1.6.0 -python-neutronclient==6.14.0 -python-novaclient==15.1.0 -python-openstackclient==4.0.0 -python-subunit==1.3.0 -python-swiftclient==3.8.1 -pytz==2019.3 -pyudev==0.21.0 -rcssmin==1.0.6 -reno==2.11.3 -repoze.lru==0.7 -requests-mock==1.6.0 -requests==2.22.0 +python-neutronclient==7.2.1 +python-novaclient==17.2.1 +python-openstackclient==5.4.0 +python-swiftclient==3.10.1 +pytz==2020.1 +pyudev==0.22.0 +requests==2.23.0 requestsexceptions==1.4.0 -restructuredtext-lint==1.3.0 retrying==1.3.3 -rfc3986==1.3.2 +rfc3986==1.4.0 rjsmin==1.1.0 -rsa==4.0 -rtslib-fb==2.1.69 -scandir==1.10.0 -scrypt==0.8.13 -selenium==3.141.0 -semantic-version==2.8.2 -setproctitle==1.1.10 +rsa==4.6 +rtslib-fb==2.1.74 +scrypt==0.8.15 +semantic-version==2.8.5 simplegeneric==0.8.1 -simplejson==3.16.0 -singledispatch==3.4.0.3 -six==1.12.0 -smmap2==2.0.5 -snowballstemmer==2.0.0 -sortedcontainers==2.1.0 -soupsieve==1.9.4 -sphinxcontrib-websupport==1.1.2 -sqlalchemy-migrate==0.12.0 -sqlparse==0.3.0 +simplejson==3.17.2 +sortedcontainers==2.2.2 +soupsieve==2.0.1 +sqlalchemy-migrate==0.13.0 +sqlparse==0.3.1 statsd==3.3.0 -stestr==2.5.1 -stevedore==1.31.0 -subprocess32==3.5.4 +stevedore==3.2.2 suds-jurko==0.6 systemd-python==234 -taskflow==3.7.1 -tenacity==5.1.1 -testrepository==0.0.20 +tabulate==0.8.7 +taskflow==4.5.0 +tenacity==6.2.0 testresources==2.0.1 testscenarios==0.5.0 -testtools==2.3.0 -tinyrpc==1.0.3 +testtools==2.4.0 +tinyrpc==1.0.4 toml==0.10.0 -tooz==1.66.2 -tox==3.14.0 -traceback2==1.4.0 -typing==3.7.4.1 -uWSGI==2.0.18 -unicodecsv==0.14.1 -unittest2==1.1.0 -uritemplate==3.0.0 -urllib3==1.25.6 +tooz==2.7.1 +tox==3.20.1 +uritemplate==3.0.1 +urllib3==1.25.10 vine==1.3.0 -virtualenv==16.7.5 +virtualenv==20.0.31 voluptuous==0.11.7 -waitress==1.3.1 +waitress==1.4.4 warlock==1.3.3 -wcwidth==0.1.7 -weakrefmethod==1.0.3 +wcwidth==0.2.5 websockify==0.9.0 -wrapt==1.11.2 -wsgi-intercept==1.8.1 -xattr==0.9.6 -xvfbwrapper==0.2.9 -yappi==1.0 +wrapt==1.12.1 +yappi==1.2.5 zVMCloudConnector==1.4.1 -zipp==0.6.0 +zipp==3.1.0 +zstd==1.4.5.1 diff --git a/elements/upstream-training/static/usr/local/bin/training-vm-preinstall-helper.sh b/elements/upstream-training/static/usr/local/bin/training-vm-preinstall-helper.sh index 6d3b981..491d594 100755 --- a/elements/upstream-training/static/usr/local/bin/training-vm-preinstall-helper.sh +++ b/elements/upstream-training/static/usr/local/bin/training-vm-preinstall-helper.sh @@ -4,12 +4,17 @@ DIST=/tmp/training-vm-preinstall-diffs mkdir -p "$DIST" apt-mark showmanual > "$DIST"/aptmark_showmanual.orig.txt -sudo -H pip freeze | sort > "$DIST"/pipfreeze.orig.txt +sudo -H pip3 freeze | sort > "$DIST"/pipfreeze.orig.txt /opt/devstack/stack.sh -apt-mark showmanual | sort > "$DIST"/aptmark_showmanual.after.txt -sudo -H pip freeze > "$DIST"/pipfreeze.after.txt +( + apt-mark showmanual + find /var/cache/apt/archives/ -iname '*.deb' -exec basename '{}' \; \ + | awk -F'_' '/deb/{ print $1 }' +) | sort | uniq > "$DIST"/aptmark_showmanual.after.txt + +sudo -H pip3 freeze | sort > "$DIST"/pipfreeze.after.txt # Generate packages.yaml comm -13 "$DIST"/aptmark_showmanual.{orig,after}.txt | sed 's/$/:/' > "$DIST"/packages.yaml