Browse Source

TRITON-2304 New image server names (#1047)

Reviewed by: Dan McDonald <danmcd@kebe.com>
Reviewed by: Thomas Merkel
Approved by: Dan McDonald <danmcd@kebe.com>
release-20220602
Brian Bennett 4 months ago committed by GitHub
parent
commit
cd306302cd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 3
      Makefile
  2. 8
      README.md
  3. 20
      src/fw/test/runtest
  4. 4
      src/img/CHANGES.md
  5. 15
      src/img/README.md
  6. 7
      src/img/lib/cli.js
  7. 3
      src/img/lib/common.js
  8. 4
      src/img/lib/errors.js
  9. 5
      src/img/lib/imgadm.js
  10. 4
      src/img/lib/upgrade.js
  11. 8
      src/img/man/imgadm.8.md
  12. 3
      src/img/node_modules/imgmanifest/lib/imgmanifest.js
  13. 15
      src/img/node_modules/sdc-clients/lib/imgapi.js
  14. 2
      src/img/package.json
  15. 3
      src/img/sbin/recover-vm-from-failed-imgadm-create.sh
  16. 47
      src/img/test/import.test.js
  17. 22
      src/img/test/mk-custom-image
  18. 3
      src/img/test/runtests
  19. 3
      src/vm/common/vmtest.js

3
Makefile

@ -582,7 +582,8 @@ triton-platform-publish: common-platform-publish
# $MANTA_TOOLS_PATH pointing to the manta-client tools scripts) or, with
# $ENGBLD_BITS_UPLOAD_LOCAL set to 'true', will upload to $ENGBLD_DEST_OUT_PATH
# on a local filesystem. If $ENGBLD_BITS_UPLOAD_IMGAPI is set in the environment
# it also publishes any images from the -D directory to updates.joyent.com.
# it also publishes any images from the -D directory to
# updates.tritondatacenter.com.
#
ENGBLD_DEST_OUT_PATH ?= /public/builds

8
README.md

@ -177,7 +177,7 @@ the image, you should run the imgadm command from the global zone:
```
# imgadm import c8715b60-7e98-11ec-82d1-03d16599f529
Importing c8715b60-7e98-11ec-82d1-03d16599f529 (base-64-lts@21.4.0) from "https://images.joyent.com"
Importing c8715b60-7e98-11ec-82d1-03d16599f529 (base-64-lts@21.4.0) from "https://images.smartos.org"
Gather image c8715b60-7e98-11ec-82d1-03d16599f529 ancestry
Must download and install 1 image (148.6 MiB)
Download 1 image [=======================>] 100% 148.62MB 497.77KB/s 5m 5s
@ -348,7 +348,7 @@ for both build flavors.
upload
* `*-bits-upload`: upload bits to either Manta, a remote filesystem
and optionally, a Triton imgapi instance, defaulting to
`updates.joyent.com`
`updates.tritondatacenter.com`
* `*-bits-upload-latest`: as above, except attempt to re-upload the
latest built bits, useful in case of interrupted uploads
@ -369,7 +369,7 @@ variables:
* `ENGBLD_BITS_UPLOAD_IMGAPI`: If set to `true`, this causes the build to
also attempt to upload any Triton images found in the `output/bits`
directory to an imgapi instance, which defaults to
`updates.joyent.com`.
`updates.tritondatacenter.com`.
For Manta and imgapi uploads, the following environment variables are
used to configure the upload:
@ -1041,4 +1041,4 @@ version and moved to a public version if/when it is upstreamed to illumos.
If the library in question is specific to illumos-joyent, then it's
alright to version it. However, this is not true for the vast majority
of libraries.
of libraries.

20
src/fw/test/runtest

@ -1,5 +1,21 @@
#!/bin/bash
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright 2018 Joyent, Inc.
# Copyright 2022 MNX Cloud, Inc.
#
set -o errexit
UNAME=$(uname -s)
@ -47,8 +63,8 @@ if [[ $OPTIND -ne $# ]]; then
fi
if [[ $UNAME == "SunOS" ]]; then
echo "# Adding images.joyent.com as an imgadm source"
imgadm sources -a "https://images.joyent.com/"
echo "# Adding images.smartos.org as an imgadm source"
imgadm sources -a "https://images.smartos.org/"
for IMG in $(/usr/node/bin/node -e "console.log(require('/usr/fw/test/lib/vm').imageUUIDs.join(' '));"); do
echo "# Installing required image $IMG"

4
src/img/CHANGES.md

@ -15,9 +15,9 @@ Known issues:
Otherwise, channels can be specified as a component of any URL parameter, e.g.
imgadm sources -a 'https://updates.joyent.com?channel=experimental'
imgadm sources -a 'https://updates.tritondatacenter.com?channel=experimental'
or
imgadm import -S 'https://updates.joyent.com?channel=experimental' <uuid>
imgadm import -S 'https://updates.tritondatacenter.com?channel=experimental' <uuid>
## 3.9.3

15
src/img/README.md

@ -3,18 +3,16 @@
`imgadm` is a tool for managing images on a local headnode or compute node. It
can import and destroy local images, present information about how they're
being used. To find and install new images, imgadm speaks to a server
implementing the IMGAPI. The default and canonical IMGAPI server is the Joyent
Images repository at <https://images.joyent.com>.
implementing the IMGAPI. The default and canonical IMGAPI server is the SmartOS
Images repository at <https://images.smartos.org>.
# Test Suite
## Test Suite
/usr/img/test/runtests
This can only be run in the global zone (GZ).
# Development
## Development
The src/img tree has no binary components, so you can get away
with faster edit/test cycle than having to do a full smartos platform
@ -32,7 +30,7 @@ build and rebooting on it. Here is how:
# On a dev machine:
# Get a clone of the repo.
git clone git@github.com:joyent/smartos-live.git
git clone git@github.com:TritonDataCenter/smartos-live.git
cd src/img
# Make edits, e.g. change the version:
@ -56,8 +54,7 @@ in order to minimize the size of the platform image.
Before commits, please (a) run the test suite on a test box per the notes
above and (b) maintain style by running `make check`.
# /var/imgadm/imgadm.conf
## /var/imgadm/imgadm.conf
"/var/imgadm/imgadm.conf" is imgadm's config file. Typically it should not be
edited as most configuration is done via `imgadm ...` commands. For example,

7
src/img/lib/cli.js

@ -21,6 +21,7 @@
* CDDL HEADER END
*
* Copyright 2020 Joyent, Inc.
* Copyright 2022 MNX Cloud, Inc.
*
* * *
*
@ -749,12 +750,12 @@ CLI.prototype.do_sources.help = (
+ '{{options}}'
+ '\n'
+ 'Examples:\n'
+ ' # Joyent\'s primary public image repository (defaults to "imgapi")\n'
+ ' {{name}} sources -a https://images.joyent.com\n'
+ ' # SmartOS primary public image repository (defaults to "imgapi")\n'
+ ' {{name}} sources -a https://images.smartos.org\n'
+ ' # Docker Hub\n'
+ ' {{name}} sources -a https://docker.io -t docker\n'
+ ' # Legacy SDC 6.5 DSAPI (deprecated)\n'
+ ' {{name}} sources -a https://datasets.joyent.com/datasets -t dsapi\n'
+ ' {{name}} sources -a https://datasets.tritondatacenter.com/datasets -t dsapi\n'
/* END JSSTYLED */
);
CLI.prototype.do_sources.options = [

3
src/img/lib/common.js

@ -21,6 +21,7 @@
* CDDL HEADER END
*
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
* Copyright 2022 MNX Cloud Inc.
*
* * *
* Dump for shared stuff for this package.
@ -49,7 +50,7 @@ var errors = require('./errors'),
var NAME = 'imgadm';
var MANIFEST_V = 2;
var DEFAULT_ZPOOL = 'zones';
var DEFAULT_SOURCE = {type: 'imgapi', url: 'https://images.joyent.com'};
var DEFAULT_SOURCE = {type: 'imgapi', url: 'https://images.smartos.org'};
var DB_DIR = '/var/imgadm';

4
src/img/lib/errors.js

@ -52,7 +52,7 @@ function _indent(s, indent) {
* a string `code` (a CamelCase string). The possible codes are those
* for every error subclass here, plus the possible `restCode` error
* responses from IMGAPI.
* See <https://mo.joyent.com/docs/imgapi/master/#errors>.
* See <https://engdoc.tritondatacenter.com/docs/imgapi/master/#errors>.
*/
function ImgadmError(options) {
assert.object(options, 'options');
@ -132,7 +132,7 @@ util.inherits(ManifestValidationError, ImgadmError);
* `requirements.min_platform` or `requirements.max_platform` fail.
*
* // JSSTYLED
* https://github.com/joyent/sdc-imgapi/blob/master/docs/index.md#manifest-requirementsmin_platform
* https://github.com/TritonDataCenter/sdc-imgapi/blob/master/docs/index.md#manifest-requirementsmin_platform
*/
function MinPlatformError(platVer, platTimestamp, minPlatSpec) {
assert.string(platVer, 'platVer');

5
src/img/lib/imgadm.js

@ -928,7 +928,7 @@ IMGADM.prototype._loadImages = function _loadImages(callback) {
}
if (origin !== '-') {
// This *may* be a filesystem using an image. See
// joyent/smartos-live#180 for a counter-example.
// TritonDataCenter/smartos-live#180 for a counter-example.
var oname = origin.split('@')[0];
if (usageFromImageName[oname] === undefined) {
usageFromImageName[oname] = [name];
@ -3289,7 +3289,8 @@ IMGADM.prototype.vacuumImages = function vacuumImages(opts, cb) {
* Dev Note: This mode with prepareScript is called "autoprep" in vars
* below.
* 2. The VM is already prepared (via the typical prepare-image scripts,
* see <https://download.joyent.com/pub/prepare-image/>) and shutdown.
* see <https://download.tritondatacenter.com/pub/prepare-image/>) and
* shutdown.
* For this "mode" do NOT pass in `options.prepareScript`.
*
* @param options {Object}

4
src/img/lib/upgrade.js

@ -21,6 +21,7 @@
* CDDL HEADER END
*
* Copyright (c) 2013, Joyent, Inc. All rights reserved.
* Copyright 2022 MNX Cloud, Inc.
*
* * *
* Here is how imgadm upgrade is intented to work:
@ -238,7 +239,8 @@ function upgradeTo200(tool, callback) {
// If the old sources only include the single default, then skip it.
// The result is that imgadm v2 just uses the new default.
var OLD_DEFAULT_SOURCE = 'https://datasets.joyent.com/datasets/';
/*JSSTYLED*/
var OLD_DEFAULT_SOURCE = 'https://datasets.tritondatacenter.com/datasets/';
if (oldSources.length === 1 && oldSources[0] === OLD_DEFAULT_SOURCE) {
next();
return;

8
src/img/man/imgadm.8.md

@ -79,7 +79,7 @@ supplied channel.
List and edit image sources.
An image source is a URL to a server implementing the IMGAPI, or
the Docker Registry API. The default IMGAPI is https://images.joyent.com
the Docker Registry API. The default IMGAPI is https://images.smartos.org
Image API server channels can be specified by including a
'?channel=<channel name>' parameter as part of the supplied <url>.
@ -115,12 +115,12 @@ supplied channel.
IMGAPI server.
Examples:
# Joyent's primary public image repository (defaults to "imgapi")
imgadm sources -a https://images.joyent.com
# SmartOS primary public image repository (defaults to "imgapi")
imgadm sources -a https://images.smartos.org
# Docker Hub
imgadm sources -a https://docker.io -t docker
# Legacy SDC 6.5 DSAPI (deprecated)
imgadm sources -a https://datasets.joyent.com/datasets -t dsapi
imgadm sources -a https://datasets.tritondatacenter.com/datasets -t dsapi
imgadm avail [<filters>]

3
src/img/node_modules/imgmanifest/lib/imgmanifest.js generated vendored

@ -6,6 +6,7 @@
/*
* Copyright (c) 2018, Joyent, Inc.
* Copyright 2018 MNX Cloud, Inc.
*/
/*
@ -302,7 +303,7 @@ function upgradeManifest(oldManifest) {
* There are multiple separate validation cases:
* - In a 'dc' mode IMGAPI (e.g. in SDC).
* validateDcManifest
* - In a 'public' mode IMGAPI (e.g. https://images.joyent.com).
* - In a 'public' mode IMGAPI (e.g. https://images.smartos.org).
* validatePublicManifest
* - In a 'private' mode IMGAPI.
* validatePrivateManifest

15
src/img/node_modules/sdc-clients/lib/imgapi.js generated vendored

@ -6,6 +6,7 @@
/*
* Copyright 2020 Joyent, Inc.
* Copyright 2022 MNX Cloud, Inc.
*/
/*
@ -26,8 +27,8 @@
* });
* client.ping(function (err, pong, res) { ... });
*
* Usage with HTTP-Signature auth (e.g. https://images.joyent.com -- however
* GETs to images.joyent.com don't require auth):
* Usage with HTTP-Signature auth (e.g. https://images.smartos.org -- however
* GETs to images.smartos.org don't require auth):
*
* var client = imgapi.createClient({
* url: <URL>,
@ -51,7 +52,7 @@
* });
*
* or as a query param on the `url`, e.g.
* <https://updates.joyent.com?channel=staging>.
* <https://updates.tritondatacenter.com?channel=staging>.
*/
var p = console.log;
@ -233,7 +234,7 @@ function simpleMerge(a, b) {
* are given, the latter wins.
* - `channel` {String} Optional. The channel to use, for IMGAPI servers
* that use channels.
* See <https://updates.joyent.com/docs/#ListChannels>.
* See <https://updates.tritondatacenter.com/docs/#ListChannels>.
* - `user` {String} Optional. Used for basic or http-signature auth.
* - `password` {String} Optional. If provided, this implies that basic
* auth should be used for client requests.
@ -889,7 +890,7 @@ function createImageFromVmAndWait(data, options, account, callback) {
*
* This differs from `createImage` in that you can import an image and
* persist its `uuid` (and `published_at`). This is for operator use only.
* Typically it is for importing existing images from images.joyent.com. When
* Typically it is for importing existing images from images.smartos.org. When
* a `source` URL of a remote IMGAPI repository is passed then the IMGAPI will
* retrieve the manifest directly, allowing clients to not need to have a
* manifest file at hand. When doing this the first parameter for the function
@ -969,7 +970,7 @@ IMGAPI.prototype.adminImportImage = function adminImportImage(
* manifest, add files and activate the image in a single step. A `source`
* parameter needs to be passed so IMGAPI can find the remote image manifest to
* be imported. This is for operator use only.
* Typically it is for importing existing images from images.joyent.com.
* Typically it is for importing existing images from images.smartos.org.
* This API call is blocking, meaning that the callback provided won't be called
* until the image has been imported completely into the local IMGAPI.
*
@ -1234,7 +1235,7 @@ function pollJob(client, job_uuid, cb) {
* manifest, add files and activate the image in a single step. A `source`
* parameter needs to be passed so IMGAPI can find the remote image manifest to
* be imported. This is for operator use only.
* Typically it is for importing existing images from images.joyent.com.
* Typically it is for importing existing images from images.smartos.org.
* This is the async version of adminImportRemoteImageAndWait. The callback
* returns an object that contains the job_uuid where clients can get details
* about the progress of the import job.

2
src/img/package.json

@ -2,7 +2,7 @@
"name": "imgadm",
"description": "Manage SmartOS virtual machine images.",
"version": "3.9.4",
"author": "Joyent (joyent.com)",
"author": "MNX Cloud (mnxsolutions.com)",
"private": true,
"dependencies": {
"assert-plus": "0.1.5",

3
src/img/sbin/recover-vm-from-failed-imgadm-create.sh

@ -2,6 +2,7 @@
#
# Copyright (c) 2018, Joyent, Inc.
# Copyright 2022 MNX Cloud, Inc.
#
#
@ -13,7 +14,7 @@
#
# This recovery script is an attempted reproduction of the relevant parts of
# IMGADM.prototype.createImage cleanup at:
# https://github.com/joyent/smartos-live/blob/71a0dd0b0eade2e8a61d1d78c8a16fe9d899c3f7/src/img/lib/imgadm.js#L3958-L4063
# https://github.com/TritonDataCenter/smartos-live/blob/71a0dd0b0eade2e8a61d1d78c8a16fe9d899c3f7/src/img/lib/imgadm.js#L3958-L4063
#
# WARNING: The "attempted reproduction" is not perfect. We are rolling back
# customer VM snapshots and deleting snapshots, and rebooting the VM here!

47
src/img/test/import.test.js

@ -21,6 +21,7 @@
* CDDL HEADER END
*
* Copyright 2020 Joyent, Inc.
* Copyright 2022 MNX Cloud, Inc.
*
* * *
*
@ -54,7 +55,7 @@ var WRKDIR = '/var/tmp/img-test-import';
var CACHEDIR = '/var/tmp/img-test-cache';
/*
* Pick an image that (a) exists on images.joyent.com (they *do* occasionally
* Pick an image that (a) exists on images.smartos.org (they *do* occasionally
* get deprecated) and (b) is relatively small and (c) is unlikely to collide
* with current usage.
*/
@ -62,15 +63,20 @@ var CACHEDIR = '/var/tmp/img-test-cache';
var TEST_IMAGE_UUID = '0764d78e-3472-11e5-8949-4f31abea4e05';
/*
* An image that only exists on the experimental channel of updates.joyent.com.
* Similar to the note above, hopefully this image will always be here and will
* not be present on images.joyent.com, since tests rely on this fact.
* During setup, we import the origin image for this experimental image.
* An image that only exists on the experimental channel of
* updates.tritondatacenter.com. Similar to the note above, hopefully this
* image will always be here and will not be present on images.smartos.org,
* since tests rely on this fact. During setup, we import the origin image for
* this experimental image. The origin image must exist on images.smartos.org
* because the experimental source hasn't been added when the origin is
* imported.
*/
var TEST_EXPERIMENTAL_SOURCE =
'https://updates.joyent.com?channel=experimental';
var TEST_EXPERIMENTAL_ORIGIN = 'fd2cc906-8938-11e3-beab-4359c665ac99';
var TEST_EXPERIMENTAL_UUID = 'b323e23f-e762-4677-a2c8-b56f3bd5ef48';
'https://updates.tritondatacenter.com?channel=experimental';
// triton-origin-multiarch-15.4.1
var TEST_EXPERIMENTAL_ORIGIN = '04a48d7d-6bb5-4e83-8c3b-e60a99e0f48f';
// vmapi@TRITON-2-20170509T232314Z-g59995b6
var TEST_EXPERIMENTAL_UUID = '7322d2f6-350f-11e7-9aac-cb944265a7cd';
var CACHEFILE = format('%s/%s.file', CACHEDIR, TEST_IMAGE_UUID);
@ -88,8 +94,8 @@ test('setup: clean WRKDIR (' + WRKDIR + ')', function (t) {
});
});
test('setup: ensure images.joyent.com source', function (t) {
exec('imgadm sources -a https://images.joyent.com', function (err, o, e) {
test('setup: ensure images.smartos.org source', function (t) {
exec('imgadm sources -a https://images.smartos.org', function (err, o, e) {
t.ifError(err);
t.end();
});
@ -97,7 +103,7 @@ test('setup: ensure images.joyent.com source', function (t) {
test('setup: get test image in local SDC IMGAPI (if available)', function (t) {
var cmd = 'sdc-imgadm import ' + TEST_IMAGE_UUID
+ ' -S https://images.joyent.com || true';
+ ' -S https://images.smartos.org || true';
exec(cmd, function (err, o, e) {
t.ifError(err);
t.end();
@ -122,7 +128,8 @@ test('setup: cache test image manifest', function (t) {
var pth = format('%s/%s.imgmanifest', CACHEDIR, TEST_IMAGE_UUID);
fs.exists(pth, function (exists) {
if (!exists) {
var cmd = format('curl -kf https://images.joyent.com/images/%s >%s',
var cmd = format(
'curl -kf https://images.smartos.org/images/%s >%s',
TEST_IMAGE_UUID, pth);
exec(cmd, function (err, stdout, stderr) {
t.ifError(err);
@ -138,7 +145,7 @@ test('setup: cache test image file', function (t) {
fs.exists(CACHEFILE, function (exists) {
if (!exists) {
var cmd = format(
'curl -kf https://images.joyent.com/images/%s/file >%s',
'curl -kf https://images.smartos.org/images/%s/file >%s',
TEST_IMAGE_UUID, CACHEFILE);
exec(cmd, function (err, stdout, stderr) {
t.ifError(err);
@ -382,7 +389,7 @@ test('pre-downloaded file (bad checksum); imgadm import ' + TEST_IMAGE_UUID,
test('setup8: rm experimental image ' + TEST_EXPERIMENTAL_UUID, function (t) {
var cmd = format(
'imgadm delete %s ;'
+ 'imgadm sources -d https://updates.joyent.com ;'
+ 'imgadm sources -d https://updates.tritondatacenter.com ;'
+ 'imgadm sources -d '
+ TEST_EXPERIMENTAL_SOURCE,
TEST_EXPERIMENTAL_UUID);
@ -395,7 +402,7 @@ test('setup8: rm experimental image ' + TEST_EXPERIMENTAL_UUID, function (t) {
// With no configured experimental sources, this should fail, which will
// also help determine whether the image has perhaps been added to
// images.joyent.com, in which case, maintainers should select a different
// images.smartos.org, in which case, maintainers should select a different
// TEST_EXPERIMENTAL_UUID (and TEST_EXPERIMENTAL_ORIGIN if necessary)
test('experimental image import fails', function (t) {
var cmd = 'imgadm import ' + TEST_EXPERIMENTAL_UUID;
@ -406,8 +413,8 @@ test('experimental image import fails', function (t) {
});
});
test('setup9: add updates.joyent.com source', function (t) {
var cmd = 'imgadm sources -a https://updates.joyent.com';
test('setup9: add updates.tritondatacenter.com source', function (t) {
var cmd = 'imgadm sources -a https://updates.tritondatacenter.com';
exec(cmd, function () {
t.end();
});
@ -447,12 +454,12 @@ test('experimental image import with -S channel url', function (t) {
});
});
// delete our experimental image and our updates.joyent.com url, then add
// that source, this time with a channel.
// delete our experimental image and our updates.tritondatacenter.com url, then
// add that source, this time with a channel.
test('setup11: delete experimental image', function (t) {
var cmd = format(
'imgadm delete %s ; '
+ 'imgadm sources -d https://updates.joyent.com ; '
+ 'imgadm sources -d https://updates.tritondatacenter.com ; '
+ 'imgadm sources -a '
+ TEST_EXPERIMENTAL_SOURCE + ' ',
TEST_EXPERIMENTAL_UUID);

22
src/img/test/mk-custom-image

@ -1,4 +1,20 @@
#!/bin/bash
#
# This file and its contents are supplied under the terms of the
# Common Development and Distribution License ("CDDL"), version 1.0.
# You may only use this file in accordance with the terms of version
# 1.0 of the CDDL.
#
# A full copy of the text of the CDDL should have accompanied this
# source. A copy of the CDDL is also available via the Internet at
# http://www.illumos.org/license/CDDL.
#
#
# Copyright 2019 Joyent, Inc.
# Copyright 2022 MNX Cloud, Inc.
#
#
# Make a SmartOS custom virtual image for testing.
#
@ -9,7 +25,7 @@
# ./mk-custom-image f669428c-a939-11e2-a485-b790efc0f0c1 /var/tmp/custom-image none
#
# This will:
# - install the base image, if necessary (from images.joyent.com)
# - install the base image, if necessary (from images.smartos.org)
# - vmadm create a basis zone
# - customize it (just set /etc/motd)
# - prepare and stop the basis zone
@ -51,8 +67,8 @@ function install_image {
imgadm get $uuid >/dev/null 2>/dev/null && return
echo "Installing image $uuid"
curl -ksS https://images.joyent.com/images/$uuid > $uuid.manifest
curl -ksS https://images.joyent.com/images/$uuid/file > $uuid.file
curl -ksS https://images.smartos.org/images/$uuid > $uuid.manifest
curl -ksS https://images.smartos.org/images/$uuid/file > $uuid.file
imgadm install -m $uuid.manifest -f $uuid.file -q
}

3
src/img/test/runtests

@ -22,6 +22,7 @@
# CDDL HEADER END
#
# Copyright (c) 2019, Joyent, Inc. All rights reserved.
# Copyright 2019 MNX Cloud, Inc.
#
#
# Run the imgadm tests. This is expected to be run from a SmartOS GZ.
@ -142,7 +143,7 @@ mkdir -p $OUTPUT_DIR
cd $TOP
# Ensure images used by tests are installed
imgadm import -S https://images.joyent.com ac99517a-72ac-44c0-90e6-c7ce3d944a0a
imgadm import -S https://images.smartos.org ac99517a-72ac-44c0-90e6-c7ce3d944a0a
# Run the tests.
echo ""

3
src/vm/common/vmtest.js

@ -21,6 +21,7 @@
* CDDL HEADER END
*
* Copyright 2019 Joyent, Inc.
* Copyright 2022 MNX Cloud, Inc.
*
*/
@ -71,7 +72,7 @@ var DEFAULT_ZFS_PROPERTIES = {
"refcompressratio": "1.00x",
"redundant_metadata": "all"
};
var IMAGES_SOURCE = 'https://images.joyent.com/';
var IMAGES_SOURCE = 'https://images.smartos.org/';
exports.CURRENT_DOCKER_IMAGE_UUID = process.env['DOCKER_BASE_IMAGE_UUID'];
exports.CURRENT_SMARTOS_UUID = '01b2c898-945f-11e1-a523-af1afbe22822';

Loading…
Cancel
Save