diff --git a/packages-oss.lock/Makefile b/packages-oss.lock/Makefile index 9929c7106381..6361530a6593 100755 --- a/packages-oss.lock/Makefile +++ b/packages-oss.lock/Makefile @@ -272,7 +272,7 @@ endef # RELEASE_TARGETS are targets in the release repo we pass control to # to perform release actions. # Note: The release repo is only available to HashiCorp employees. -RELEASE_TARGETS := build-ci stage-config stage custom-build custom-build-config +RELEASE_TARGETS := build-ci stage-config stage custom-build custom-build-config orchestrator stop-orchestrator bundle # We always rev-parse the PRODUCT_REVISION to obtain the full SHA. This is required # for downstream processes which use it to determine part of the package name. @@ -280,14 +280,18 @@ $(RELEASE_TARGETS): PRODUCT_REVISION := $(shell git rev-parse $${PRODUCT_REVISIO $(RELEASE_TARGETS): PRODUCT_VERSION ?= 0.0.0-$(USER)-snapshot $(RELEASE_TARGETS): RELEASE_SYSTEM_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) custom-build: PRODUCT_VERSION := $(PRODUCT_VERSION)-$(PRODUCT_REVISION) +bundle: PRODUCT_VERSION := $(shell $(call QUERY_LOCK,.packages[0].inputs.PRODUCT_VERSION)) +orchestrator: PRODUCT_VERSION := $(shell $(call QUERY_LOCK,.packages[0].inputs.PRODUCT_VERSION)) +stop-orchestrator: PRODUCT_VERSION := $(shell $(call QUERY_LOCK,.packages[0].inputs.PRODUCT_VERSION)) $(RELEASE_TARGETS): @\ + echo $(PRODUCT_VERSION) \ $(call REQUIRE_EXPORT,PRODUCT_REVISION PRODUCT_VERSION) \ $(call INVOKE_RELEASER_TARGET,$@) # QUERY_TARGETS are targets in the release repo that perform queries, and are therefore # not necessarily bound to a specific PRODUCT_VERSION or PRODUCT_REVISION. -QUERY_TARGETS := list-staged-builds list-custom-builds watch-ci +QUERY_TARGETS := list-staged-builds list-promoted-builds list-custom-builds watch-ci $(QUERY_TARGETS): RELEASE_SYSTEM_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) $(QUERY_TARGETS): @@ -297,7 +301,7 @@ $(QUERY_TARGETS): # BUNDLE_TARGETS are targets acting on specific staged bundles, identified by # their BUNDLE_ID. -BUNDLE_TARGETS := publish-config publish inspect-staged-build +BUNDLE_TARGETS := publish-config publish inspect-staged-build workflow $(BUNDLE_TARGETS): RELEASE_SYSTEM_BRANCH ?= $(shell git rev-parse --abbrev-ref HEAD) $(BUNDLE_TARGETS): diff --git a/packages-oss.lock/pkgs.yml b/packages-oss.lock/pkgs.yml index 8bb9e22d2141..f2369e275329 100644 --- a/packages-oss.lock/pkgs.yml +++ b/packages-oss.lock/pkgs.yml @@ -2,7 +2,7 @@ # WARNING: Do not EDIT or MERGE this file, it is generated by packagespec. # *** lockid: ab0671082609259 -packagespec-version: 0.1.8 +packagespec-version: 0.2.1 cache-version: 10 packages: - packagespecid: 3cfda1b5690c307901c2e26baa059f3225c5792b @@ -1040,7 +1040,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/00-base-c6cdf1b224722d2520e082320f2a71875913247c.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental FROM debian@sha256:68f4e2259032a4e6f5035804e64438b52af8dd5889528b305b9059183ea4cd2a COPY . ./ RUN apt-get update -y && apt-get install --no-install-recommends -y -q \ @@ -1079,7 +1079,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/01-install-go-f39f5d66161bdd79b182943a3accdd95510c4812.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1116,7 +1116,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/02-install-go-tools-c0f572164cd4805f2bcf77664d7e02c169682491.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1157,7 +1157,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/03-set-workdir-a8232400e220adcccbb9c45a41542b9497d0d21f.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1200,7 +1200,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/04-install-yarn-d8f06ad14416849abce755043d691e698bd16d6a.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1248,7 +1248,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/05-ui-dependencies-e32637cb0eddbb636aaba43367db03df2b6c8228.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1297,7 +1297,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/06-build-ui-c0c18cf205eaf5d086df0541b933590c0454d50f.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1349,7 +1349,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/07-build-static-assets-e23f11958f5d6048adf70a68cab759daa7d4e9ec.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1407,7 +1407,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-1ce66dc58d9ec357d697563da06154d95a7b8a76.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1476,7 +1476,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-2a90b25907a244b900c02041d5b27b66096c79df.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1545,7 +1545,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-2aaf987a79095762632661b8ff817917ba8d209f.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1614,7 +1614,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-2acf1e8389625df5b2d8fd00c5fa885bae6e4f94.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1683,7 +1683,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-4339590094cca89509c17741fd4ba687c9fa09ee.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1752,7 +1752,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-45ea5bd8910aa5c35a2af5413312d9716a0eb0ae.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1821,7 +1821,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-48500a341da0b3cae6abb474f9868691e7d9d968.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1890,7 +1890,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-5e051f92bd8ac34b8a78c0dcf9dab89bbd8c0426.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -1959,7 +1959,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-8e80d1c776d33874d847863ff9497834c310c9f8.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2028,7 +2028,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-92cf8a8ea528abdcb40c5c3639195642954e791d.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2097,7 +2097,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-ade836c260a85f2bc84a6a84b6b9a419481252c8.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2166,7 +2166,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-bfcdb0fa2d8ec2f97b2cab79746ada0859db45df.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2235,7 +2235,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-c0b3f3ad17f14c032485a741e945f3d30d41f9a5.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2304,7 +2304,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-c2ae7ddbb48f16482e2bbf633b54770fe49c4594.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2373,7 +2373,7 @@ layers: sourceexclude: "" archivefile: .buildcache/archives/08-warm-go-build-vendor-cache-f7b794760ba853e1d11317ab5830d3e68f0c2633.tar.gz dockerfile: |- - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2442,7 +2442,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-009e1e69aba503ce5fdbf2f48cefff4a0c82eb73.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2505,7 +2505,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-33c2f9be8881887826e7e645b67a92b0264c58bd.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2568,7 +2568,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-3fa7c2ec774cfd3605418c089bab31a8552c7e7e.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2631,7 +2631,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-41961b85200c5fc82fc4d3fabc539b349cc56f0b.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2694,7 +2694,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-5a989a06c2dd98384bd559ba754a7d6003fde9e4.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2757,7 +2757,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-73b6f35201afec0dbb0cc6c797449e75e2bf2aec.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2820,7 +2820,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-79d218bee24e47c9452ca3144f8e46149afce4a7.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2883,7 +2883,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-8c288f0c97728893ee892961eec6cc8a137073d6.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -2946,7 +2946,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-9124fa9e7341fbffa18630ccc972573d2abba914.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -3009,7 +3009,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-93f6c0a1d11613157c252249f539029cd0f911b7.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -3072,7 +3072,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-a4c95166364328f70e7290ad510cd8f1336fd7e6.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -3135,7 +3135,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-b218473c8b6ca72647cfe95cce2e5e4fca8cf414.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -3198,7 +3198,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-b486237ca8b4ec9d3c7d1489dc01c7ff6d313199.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -3261,7 +3261,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-e88af18a9f01107078f643bb46e1b0d02f28af43.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ @@ -3324,7 +3324,7 @@ layers: sourceexclude: vendor/ ui/ archivefile: .buildcache/archives/09-copy-source-f5da6f27f29fbfc43194b26351dc8c05a07bfc91.tar.gz dockerfile: | - # syntax=hashicorp.jfrog.io/docker/docker/dockerfile:1.1.7-experimental + # syntax=docker.mirror.hashicorp.services/docker/dockerfile:1.1.7-experimental ARG BASE_IMAGE FROM $BASE_IMAGE COPY . ./ diff --git a/packagespec.mk b/packagespec.mk index 433d71bea140..7c5e12a7200a 100755 --- a/packagespec.mk +++ b/packagespec.mk @@ -44,9 +44,13 @@ PASSTHROUGH_TARGETS := \ aliases meta package package-meta package-meta-all \ build-ci watch-ci \ stage-config stage custom-build custom-build-config\ + bundle \ + orchestrator stop-orchestrator \ list-custom-builds \ list-staged-builds \ - publish-config publish + list-promoted-builds \ + publish-config publish \ + workflow .PHONY: $(PASSTHROUGH_TARGETS)