From a202f4a99280128afbb1fbccbd73109e3b444c4a Mon Sep 17 00:00:00 2001 From: Brian Bennett Date: Mon, 28 Mar 2022 17:23:03 -0700 Subject: [PATCH] TRITON-2274 update moray base image to triton-origin-x86_64-21.4.0 (#26) Reviewed by: Dan McDonald --- Jenkinsfile | 4 ++-- Makefile | 20 +++++++++++--------- deps/eng | 2 +- deps/javascriptlint | 2 +- deps/manta-scripts | 2 +- deps/restdown | 2 +- deps/sdc-scripts | 2 +- package.json | 6 +++--- 8 files changed, 21 insertions(+), 19 deletions(-) diff --git a/Jenkinsfile b/Jenkinsfile index c258a16..35d7b75 100644 --- a/Jenkinsfile +++ b/Jenkinsfile @@ -5,7 +5,7 @@ */ /* - * Copyright 2021 Joyent, Inc. + * Copyright 2022 Joyent, Inc. */ @Library('jenkins-joylib@v1.0.8') _ @@ -13,7 +13,7 @@ pipeline { agent { - label joyCommonLabels(image_ver: '15.4.1') + label joyCommonLabels(image_ver: '21.4.0', pi: '20210826T002459Z') } options { diff --git a/Makefile b/Makefile index 6f11288..fe21f17 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ # # -# Copyright 2021 Joyent, Inc. +# Copyright 2022 Joyent, Inc. # # @@ -30,8 +30,7 @@ NAME = moray DOC_FILES = index.md JS_FILES := $(shell ls *.js) $(shell find lib -name '*.js' | grep -v sql.js) ESLINT_FILES := $(JS_FILES) -JSL_CONF_NODE = tools/jsl.node.conf -JSL_FILES_NODE = $(JS_FILES) +ESLINT_FILES = $(JS_FILES) JSSTYLE_FILES = $(JS_FILES) JSSTYLE_FLAGS = -C -f ./tools/jsstyle.conf SMF_MANIFESTS_IN = smf/manifests/haproxy.xml.in @@ -46,10 +45,10 @@ CLEAN_FILES += node_modules cscope.files \ # ifeq ($(shell uname -s),SunOS) - # Allow building on a SmartOS image other than sdc-*-multiarch 15.4.1. - NODE_PREBUILT_IMAGE = 18b094b0-eb01-11e5-80c1-175dac7ddf02 - NODE_PREBUILT_TAG = zone - NODE_PREBUILT_VERSION := v6.17.0 + # minimal-64-lts@21.4.0 + NODE_PREBUILT_IMAGE = a7199134-7e94-11ec-be67-db6f482136c2 + NODE_PREBUILT_TAG = zone64 + NODE_PREBUILT_VERSION := v6.17.1 endif # RELENG-341: no npm cache is making builds unreliable @@ -60,6 +59,8 @@ ENGBLD_REQUIRE := $(shell git submodule update --init deps/eng) include ./deps/eng/tools/mk/Makefile.defs TOP ?= $(error Unable to access eng.git submodule Makefiles.) +BUILD_PLATFORM = 20210826T002459Z + ifeq ($(shell uname -s),SunOS) include ./deps/eng/tools/mk/Makefile.node_prebuilt.defs include ./deps/eng/tools/mk/Makefile.agent_prebuilt.defs @@ -78,11 +79,12 @@ RELEASE_TARBALL := $(NAME)-pkg-$(STAMP).tar.gz ROOT := $(shell pwd) RELSTAGEDIR := /tmp/$(NAME)-$(STAMP) -BASE_IMAGE_UUID = 04a48d7d-6bb5-4e83-8c3b-e60a99e0f48f +# triton-origin-x86_64-21.4.0 +BASE_IMAGE_UUID = 502eeef2-8267-489f-b19c-a206906f57ef BUILDIMAGE_NAME = mantav2-moray BUILDIMAGE_DESC = Manta moray BUILDIMAGE_DO_PKGSRC_UPGRADE = true -BUILDIMAGE_PKGSRC = haproxy-1.6.2 postgresql92-client-9.2.19 +BUILDIMAGE_PKGSRC = haproxy-2.5.0 postgresql96-client-9.6.24nb1 AGENTS = amon config registrar # diff --git a/deps/eng b/deps/eng index 77c7bb4..377b00d 160000 --- a/deps/eng +++ b/deps/eng @@ -1 +1 @@ -Subproject commit 77c7bb496d1b0b201eb948080fdd8cd8d4e1fc41 +Subproject commit 377b00dbafca523a058f00037d1199268d2843ed diff --git a/deps/javascriptlint b/deps/javascriptlint index ad52812..a365abe 160000 --- a/deps/javascriptlint +++ b/deps/javascriptlint @@ -1 +1 @@ -Subproject commit ad52812e77bdfb1e90fb71a1201adb2b665a27e6 +Subproject commit a365abebde31d1f7cc57741f365a3025dc4527ca diff --git a/deps/manta-scripts b/deps/manta-scripts index cd8d6f1..1db6194 160000 --- a/deps/manta-scripts +++ b/deps/manta-scripts @@ -1 +1 @@ -Subproject commit cd8d6f194ba34dfaa4b0740dfbd11147041dd13e +Subproject commit 1db619459a1c739a5e08cf8709315a08df9eba59 diff --git a/deps/restdown b/deps/restdown index 4aa9e59..044b34e 160000 --- a/deps/restdown +++ b/deps/restdown @@ -1 +1 @@ -Subproject commit 4aa9e59b9c4bc66a13d6c79e8e79ca40b46dbdf1 +Subproject commit 044b34e987ae75ce2a7e20773c47752f85c5bea7 diff --git a/deps/sdc-scripts b/deps/sdc-scripts index deefaef..a88d76b 160000 --- a/deps/sdc-scripts +++ b/deps/sdc-scripts @@ -1 +1 @@ -Subproject commit deefaef587ed3bee2706cb6e53ee3468e682932e +Subproject commit a88d76b116def55d1c7d468629d4719270495d68 diff --git a/package.json b/package.json index 68af6cf..6b59cfe 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "moray-server", "description": "SmartDataCenter H/A Key/Value store", - "version": "2.5.0", + "version": "2.6.0", "author": "Joyent (joyent.com)", "private": true, "main": "lib/index.js", @@ -17,7 +17,7 @@ "dtrace-provider": "~0.8", "deep-equal": "0.0.0", "exeunt": "^1.1.1", - "fast": "3.1.1", + "fast": "3.1.3", "forkexec": "^1.1.0", "ip6addr": "0.2.2", "jsprim": "1.4.0", @@ -27,7 +27,7 @@ "libuuid": "0.2.1", "lru-cache": "2.5.0", "node-manatee": "git+https://github.com/joyent/node-manatee.git#262828a8", - "moray": "3.7.0", + "moray": "3.8.1", "microtime": "2.1.6", "once": "1.3.0", "pg": "6.2.4",