Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
The diff you're trying to view is too large. We only load the first 3000 changed files.
50 changes: 9 additions & 41 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -1,61 +1,29 @@
language: python

cache: pip
# env:
# - PR_AUTHOR=${TRAVIS_PULL_REQUEST_SLUG::-15}

git:
depth: 1

jobs:
allow_failures:
env:
- CAN_FAIL=true
include:
- stage: build
name: "Build openshift-enterprise distro"
before_install:
- gem install asciidoctor
- gem install asciidoctor-diagram
install:
- pip3 install pyyaml
- pip3 install aura.tar.gz
script:
- python3 build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.12 --no-upstream-fetch && python3 makeBuild.py
- # stage name not required, will continue to use `build`
if: branch IN (main, enterprise-4.12, enterprise-4.13)
name: "Build openshift-dedicated distro"
before_install:
- gem install asciidoctor
- gem install asciidoctor-diagram
install:
- pip3 install pyyaml
- pip3 install aura.tar.gz
script:
- python3 build.py --distro openshift-dedicated --product "OpenShift Dedicated" --version 4 --no-upstream-fetch && python3 makeBuild.py
- # stage name not required, will continue to use `build`
if: branch IN (main, enterprise-4.12, enterprise-4.13)
name: "Build openshift-rosa distro"
before_install:
- gem install asciidoctor
- gem install asciidoctor-diagram
install:
- pip3 install pyyaml
- pip3 install aura.tar.gz
script:
- python3 build.py --distro openshift-rosa --product "Red Hat OpenShift Service on AWS" --version 4 --no-upstream-fetch && python3 makeBuild.py
- # stage name not required, will continue to use `build`
if: branch IN (main, enterprise-4.12, enterprise-4.13)
name: "Build microshift distro"
name: "Build openshift-serverless distro"
before_install:
- gem install asciidoctor
- gem install asciidoctor-diagram
install:
- pip3 install pyyaml
- pip3 install aura.tar.gz
script:
- python3 build.py --distro microshift --product "MicroShift" --version 4 --no-upstream-fetch && python3 makeBuild.py
- python3 build.py --distro openshift-serverless --product "OpenShift Serverless" --version 1.28 --no-upstream-fetch && python3 makeBuild.py
- stage: check-with-vale
env:
- CAN_FAIL=true
if: type IN (pull_request) AND sender != "openshift-cherrypick-robot"
if: type IN (pull_request)
name: "Run Vale against PR asciidoc files"
language: minimal
before_script:
Expand All @@ -72,15 +40,15 @@ jobs:
# if: env(PR_AUTHOR)=openshift-cherrypick-robot
# script: bash ./automerge.sh
- stage: netlify
name: "Create Netlify preiview"
env:
- CAN_FAIL=true
language: minimal
if: type IN (pull_request) AND branch IN (main, enterprise-4.12, enterprise-4.13) AND sender != "openshift-cherrypick-robot"
if: branch IN (serverless-docs, serverless-docs-1.28)
script:
- chmod +x autopreview.sh && ./autopreview.sh

stages:
- build
- netlify
- check-with-vale
#- automerge
- netlify
6 changes: 0 additions & 6 deletions Dockerfile

This file was deleted.

4 changes: 0 additions & 4 deletions Gemfile

This file was deleted.

3 changes: 0 additions & 3 deletions Guardfile

This file was deleted.

1 change: 0 additions & 1 deletion Rakefile

This file was deleted.

18 changes: 0 additions & 18 deletions _attributes/attributes-microshift.adoc

This file was deleted.

33 changes: 0 additions & 33 deletions _attributes/attributes-openshift-dedicated.adoc

This file was deleted.

40 changes: 11 additions & 29 deletions _attributes/common-attributes.adoc
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
// The {product-title} attribute provides the context-sensitive name of the relevant OpenShift distribution, for example, "OpenShift Container Platform" or "OKD". The {product-version} attribute provides the product version relative to the distribution, for example "4.9".
// {product-title} and {product-version} are parsed when AsciiBinder queries the _distro_map.yml file in relation to the base branch of a pull request.
// The {ocp-product-title} attribute provides the context-sensitive name of the relevant OpenShift distribution, for example, "OpenShift Container Platform" or "OKD". The {product-version} attribute provides the product version relative to the distribution, for example "4.9".
// {ocp-product-title} and {product-version} are parsed when AsciiBinder queries the _distro_map.yml file in relation to the base branch of a pull request.
// See https://github.com/openshift/openshift-docs/blob/main/contributing_to_docs/doc_guidelines.adoc#product-name-and-version for more information on this topic.
// Other common attributes are defined in the following lines:
:data-uri:
Expand All @@ -15,24 +15,13 @@
:op-system-base: RHEL
:op-system-base-full: Red Hat Enterprise Linux (RHEL)
:op-system-version: 8.x
ifdef::openshift-origin[]
:op-system-first: Fedora CoreOS (FCOS)
:op-system: FCOS
:op-system-lowercase: fcos
:op-system-base: Fedora
:op-system-base-full: Fedora
:op-system-version: 35
endif::[]

:tsb-name: Template Service Broker
:kebab: image:kebab.png[title="Options menu"]
ifndef::openshift-origin[]

:rh-openstack-first: Red Hat OpenStack Platform (RHOSP)
:rh-openstack: RHOSP
endif::openshift-origin[]
ifdef::openshift-origin[]
:rh-openstack-first: OpenStack
:rh-openstack: OpenStack
endif::openshift-origin[]

:ai-full: Assisted Installer
:ai-version: 2.3
:cluster-manager-first: Red Hat OpenShift Cluster Manager
Expand All @@ -59,11 +48,7 @@ endif::openshift-origin[]
:rh-virtualization-first: Red Hat Virtualization (RHV)
:rh-virtualization: RHV
:rh-virtualization-engine-name: Manager
ifdef::openshift-origin[]
:rh-virtualization-first: oVirt
:rh-virtualization: oVirt
:rh-virtualization-engine-name: Engine
endif::[]

// Backup and restore
:velero-domain: velero.io
:velero-version: 1.9
Expand All @@ -76,11 +61,7 @@ endif::[]
:builds-v2title: Builds for Red Hat OpenShift
:builds-v2shortname: OpenShift Builds v2
:builds-v1shortname: OpenShift Builds v1
ifdef::openshift-origin[]
:builds-v2title: Shipwright
:builds-v2shortname: Shipwright
:builds-v1shortname: Builds v1
endif::[]

//gitops
:gitops-title: Red Hat OpenShift GitOps
:gitops-shortname: GitOps
Expand All @@ -107,9 +88,7 @@ endif::[]
:KubeVirtVersion: v0.59.0
:HCOVersion: 4.13.0
:delete: image:delete.png[title="Delete"]
ifdef::openshift-origin[]
:VirtProductName: OKD Virtualization
endif::[]

//distributed tracing
:DTProductName: Red Hat OpenShift distributed tracing
:DTShortName: distributed tracing
Expand Down Expand Up @@ -175,3 +154,6 @@ endif::[]
:ztp: GitOps ZTP
:3no: three-node OpenShift
:3no-caps: Three-node OpenShift


:ocp-product-title: OpenShift Container Platform
12 changes: 0 additions & 12 deletions _attributes/servicebinding-document-attributes.adoc

This file was deleted.

Loading