Skip to content

Commit fed260a

Browse files
committed
fix(oci): the Marketplace publish needs no manual step
Submitting the draft listing revision starts the publishing: the new package lands in the "Publish in Progress" stage and Oracle carries it to Live. The job summary and the Mattermost notification claimed the opposite - "submitted for review ... Publish it from there manually once it is approved" - which sent readers looking for a Console action that does not exist. Reword the status in oci-marketplace-steps (used by the unified oci-build-release-test-publish.yml) and in the standalone oci-marketplace-publish.yml, keeping the two in sync, and drop the same claim from the OCI docs and the scheduled-builds note (only Azure Live publishing stays manual). The debug/warning lines around the submit call keep their wording: they describe the submit-listing-revision-for-review CLI operation, and a failed submission really does need a manual retry from the Console.
1 parent c6059d0 commit fed260a

6 files changed

Lines changed: 33 additions & 32 deletions

File tree

‎.github/actions/oci-marketplace-steps/action.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -623,10 +623,10 @@ runs:
623623
echo "- **Revision Package**: \`${{ env.PACKAGE_VERSION }}\` (\`${{ env.PACKAGE_ID }}\`)"
624624
echo ""
625625
echo "### Status"
626-
echo "✅ Draft revision created, package added, and submitted for review."
626+
echo "✅ Draft revision created, package added, and submitted for publishing."
627627
echo ""
628-
echo "Check it on the [Oracle Cloud Console](${{ env.OCI_PUBLISHER_BASE_URL }}/listing/${{ env.LISTING_OCID }}/${{ env.DRAFT_REVISION_ID }}?region=${{ inputs.OCI_CLI_REGION }})"
629-
echo "Publish it from there manually once it is approved"
628+
echo "The new package is in the **Publish in Progress** stage - no manual action required."
629+
echo "Track it on the [Oracle Cloud Console](${{ env.OCI_PUBLISHER_BASE_URL }}/listing/${{ env.LISTING_OCID }}/${{ env.DRAFT_REVISION_ID }}?region=${{ inputs.OCI_CLI_REGION }})"
630630
} >> "$GITHUB_STEP_SUMMARY"
631631
632632
- name: Send notification to Mattermost
@@ -647,6 +647,6 @@ runs:
647647
**Draft Revision**: [${{ env.LISTING_REVISION_NAME }}](${{ env.OCI_PUBLISHER_BASE_URL }}/listing/${{ env.LISTING_OCID }}/${{ env.DRAFT_REVISION_ID }}?region=${{ inputs.OCI_CLI_REGION }})
648648
**Revision Package**: `${{ env.PACKAGE_VERSION }}` (`${{ env.PACKAGE_ID }}`)
649649
650-
✅ Draft revision created, package added, and submitted for review.
651-
Check it on the [Oracle Cloud Console](${{ env.OCI_PUBLISHER_BASE_URL }}/listing/${{ env.LISTING_OCID }}/${{ env.DRAFT_REVISION_ID }}?region=${{ inputs.OCI_CLI_REGION }})
652-
Publish it from there manually once it is approved
650+
✅ Draft revision created, package added, and submitted for publishing.
651+
The new package is in the **Publish in Progress** stage - no manual action required.
652+
Track it on the [Oracle Cloud Console](${{ env.OCI_PUBLISHER_BASE_URL }}/listing/${{ env.LISTING_OCID }}/${{ env.DRAFT_REVISION_ID }}?region=${{ inputs.OCI_CLI_REGION }})

‎.github/workflows/oci-marketplace-publish.yml‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1233,10 +1233,10 @@ jobs:
12331233
echo ""
12341234
echo "### Status"
12351235
if [[ "${{ inputs.release_to_marketplace }}" == "true" ]]; then
1236-
echo "✅ Draft revision created, package added, and submitted for review."
1236+
echo "✅ Draft revision created, package added, and submitted for publishing."
12371237
echo ""
1238-
echo "Check it on the [Oracle Cloud Console](${{ env.OCI_PUBLISHER_BASE_URL }}/listing/${{ env.LISTING_OCID }}/${{ env.DRAFT_REVISION_ID }}?region=${{ vars.OCI_CLI_REGION }})"
1239-
echo "Publish it from there manually once it is approved"
1238+
echo "The new package is in the **Publish in Progress** stage - no manual action required."
1239+
echo "Track it on the [Oracle Cloud Console](${{ env.OCI_PUBLISHER_BASE_URL }}/listing/${{ env.LISTING_OCID }}/${{ env.DRAFT_REVISION_ID }}?region=${{ vars.OCI_CLI_REGION }})"
12401240
else
12411241
if [[ "${{ inputs.image_source_type }}" == "QCOW2 file URL" ]]; then
12421242
echo "❌ **Marketplace release was not requested** (only Compute Image import and Object Storage upload performed)"
@@ -1266,9 +1266,9 @@ jobs:
12661266
${{ inputs.release_to_marketplace && format('**Draft Revision**: [{0}]({1}/listing/{2}/{3}?region={4})', env.LISTING_REVISION_NAME, env.OCI_PUBLISHER_BASE_URL, env.LISTING_OCID, env.DRAFT_REVISION_ID, vars.OCI_CLI_REGION) || '' }}
12671267
${{ inputs.release_to_marketplace && format('**Revision Package**: `{0}` (`{1}`)', env.PACKAGE_VERSION, env.PACKAGE_ID) || '' }}
12681268
1269-
${{ inputs.release_to_marketplace && '✅ Draft revision created, package added, and submitted for review.' || '' }}
1270-
${{ inputs.release_to_marketplace && format('Check it on the [Oracle Cloud Console]({0}/listing/{1}/{2}?region={3})', env.OCI_PUBLISHER_BASE_URL, env.LISTING_OCID, env.DRAFT_REVISION_ID, vars.OCI_CLI_REGION) || '' }}
1271-
${{ inputs.release_to_marketplace && 'Publish it from there manually once it is approved' || '' }}
1269+
${{ inputs.release_to_marketplace && '✅ Draft revision created, package added, and submitted for publishing.' || '' }}
1270+
${{ inputs.release_to_marketplace && 'The new package is in the **Publish in Progress** stage - no manual action required.' || '' }}
1271+
${{ inputs.release_to_marketplace && format('Track it on the [Oracle Cloud Console]({0}/listing/{1}/{2}?region={3})', env.OCI_PUBLISHER_BASE_URL, env.LISTING_OCID, env.DRAFT_REVISION_ID, vars.OCI_CLI_REGION) || '' }}
12721272
12731273
${{ ( ! inputs.release_to_marketplace && inputs.image_source_type == 'QCOW2 file URL' ) && '❌ **Marketplace release was not requested** (only Compute Image import and Object Storage upload performed)' || '' }}
12741274
${{ ( ! inputs.release_to_marketplace && inputs.image_source_type == 'Compute Image OCID' ) && '❌ **Marketplace release was not requested** (only image data resolution performed)' || '' }}

‎.github/workflows/scheduled-builds.yml‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,10 @@ run-name: >-
1414
# publishing - a scheduled firing is a real release cycle: AWS releases
1515
# AMIs to all regions + Marketplace + wiki PR, Vagrant publishes boxes to
1616
# HCP, Azure releases to the gallery and creates Marketplace drafts, OCI
17-
# creates a Compute Image and submits a Marketplace draft for review
18-
# (Azure/OCI Live publishing stays manual). Tests gate publishing inside
19-
# each workflow. gcp-build-test-publish.yml is deliberately NOT scheduled.
17+
# creates a Compute Image and submits a Marketplace revision for
18+
# publishing (only Azure Live publishing stays manual). Tests gate
19+
# publishing inside each workflow. gcp-build-test-publish.yml is
20+
# deliberately NOT scheduled.
2021
#
2122
# Version quirks handled in the dispatch step:
2223
# - aws-build-test-copy-release.yml spells Kitten 'kitten_10' (translated)

‎OCI_BUILD_RELEASE_TEST_PUBLISH.md‎

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ OCI image lifecycle in a single `workflow_dispatch`:
1313
3. **Test** every Compute Image (launch a fresh instance, assert
1414
release / arch / RPMs / disk / `dnf`).
1515
4. **Publish to Listings**: publish every image that passed its test to
16-
the OCI Marketplace as a draft listing revision, submitted for review.
16+
the OCI Marketplace as a draft listing revision, submitted for publishing.
1717

1818
It reuses the same composite actions the standalone OCI workflows are
1919
built from, so behaviour matches them stage-for-stage. The standalone
@@ -49,7 +49,7 @@ qcow2 re-download.
4949
| `store_as_artifact` | `false` | Upload images as workflow artifacts. |
5050
| `upload_to_s3` | `true` | Still uploads to S3 in parallel; the compute-image stage no longer depends on it. |
5151
| `create_compute_image` | `true` | **Master gate** for stages 2-4. `false` = build-only run. |
52-
| `release_to_marketplace` | `true` | Release the image to the Marketplace listing (draft revision, submitted for review). |
52+
| `release_to_marketplace` | `true` | Release the image to the Marketplace listing (draft revision, submitted for publishing). |
5353
| `notify_mattermost` | `true` | Post per-stage notifications to Mattermost. |
5454

5555
### Stage gating
@@ -136,11 +136,12 @@ first and falls back to `dnf` so it works on the EL9 aarch64 runner.
136136
(this is the key difference from the Azure unified workflow, where
137137
aarch64 and aarch64-64k share one offer and must serialise).
138138
- The aarch64 + major-10 listing is matched as `AArch64/ARM64`.
139-
- Publishing to **Live is always manual** in the Oracle Cloud Console,
140-
even after a successful review submission. The workflow leaves a draft
141-
revision submitted for review; publish it from the Console once Oracle
142-
approves. See [OCI_MARKETPLACE.md](OCI_MARKETPLACE.md) for the
143-
listing / terms / artifact flow in detail.
139+
- The workflow submits the draft revision for publishing: the new package
140+
lands in the **Publish in Progress** stage and Oracle carries it to Live -
141+
no manual action in the Console is required. Publishing the new revision
142+
automatically unpublishes the previous one. See
143+
[OCI_MARKETPLACE.md](OCI_MARKETPLACE.md) for the listing / terms /
144+
artifact flow in detail.
144145

145146
## Required GitHub Configuration
146147

‎OCI_MARKETPLACE.md‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ graph TD
241241
WC --> UD[Update Draft Version Details]
242242
UD --> UN[Unset Default on Old Packages]
243243
UN --> NP[Create New Package as Default]
244-
NP --> SB[Submit Draft for Review]
244+
NP --> SB[Submit Draft for Publishing]
245245
SB --> S
246246
S --> MM[Send Mattermost Notification]
247247
```
@@ -305,14 +305,13 @@ When the source type is `Artifact OCID`, artifact creation is skipped entirely
305305
2. **Update** the draft's version details (version number, release date, release notes link), headline, and tagline
306306
3. **Unset default** on any existing default packages in the draft
307307
4. **Create** a new package as default (linking artifact + terms + version)
308-
5. **Submit** the draft for Oracle review
308+
5. **Submit** the draft for publishing
309309

310-
After Oracle approves the revision, it must be **published manually** from the OCI Console. Publishing the new revision automatically unpublishes the previous one.
310+
Submitting moves the new package to the **Publish in Progress** stage; Oracle carries it to Live with no manual action required. Publishing the new revision automatically unpublishes the previous one.
311311

312-
## Manual Steps After Workflow Completes
312+
## After the Workflow Completes
313313

314-
1. **Wait for Oracle to approve** the submitted revision (check status in OCI Console)
315-
2. **Publish** the approved revision from the [OCI Publisher Console](https://cloud.oracle.com/publisher) — the previous revision is automatically unpublished
314+
No manual steps are required: the new package is in the **Publish in Progress** stage. Track it in the [OCI Publisher Console](https://cloud.oracle.com/publisher); once it goes Live, the previous revision is automatically unpublished.
316315

317316
## Testing
318317

‎SCHEDULED_BUILDS.md‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -14,10 +14,10 @@ version-aware `run-name` works natively for scheduled runs.
1414
> runs the FULL pipeline, publishing included: AWS releases AMIs to all
1515
> regions + Marketplace + a wiki PR, Vagrant publishes boxes to HCP, Azure
1616
> releases to the Compute Gallery and creates Marketplace drafts, OCI
17-
> creates a Compute Image and submits a Marketplace draft for review
18-
> (Azure/OCI Live publishing stays manual). Tests gate publishing inside
19-
> each workflow. `gcp-build-test-publish.yml` is deliberately NOT
20-
> scheduled.
17+
> creates a Compute Image and submits a Marketplace revision for
18+
> publishing (only Azure Live publishing stays manual). Tests gate
19+
> publishing inside each workflow. `gcp-build-test-publish.yml` is
20+
> deliberately NOT scheduled.
2121
2222
## The schedule
2323

0 commit comments

Comments
 (0)