Skip to content

Commit bab1e10

Browse files
author
Vikram Goyal
committed
Check in for buckets and other setup for 4.0
1 parent c153216 commit bab1e10

40 files changed

Lines changed: 1494 additions & 99 deletions

.travis.yml

Lines changed: 25 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,25 @@
1-
language: ruby
2-
cache: bundler
3-
rvm:
4-
- 2.3.1
5-
gemfile: Gemfile
6-
after_install: gem list
7-
script: bundle exec rake build
8-
notifications:
9-
email:
10-
#recipients:
11-
# - dev@lists.openshift.redhat.com
12-
irc:
13-
- "irc.freenode.org#openshift-dev"
1+
language: python
2+
3+
cache: pip
4+
5+
sudo: required
6+
7+
before_install:
8+
- sudo gem install asciidoctor -v 1.5.4
9+
- sudo gem install asciidoctor-diagram -v 1.5.4
10+
11+
install:
12+
- pip install pyyaml
13+
- pip install aura.tar.gz
14+
15+
script:
16+
- python build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 3 --no-upstream-fetch
17+
- if [ "$TRAVIS_BRANCH" == "enterprise-3.9" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.10" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.11" ]; then python build.py --distro openshift-online --product "OpenShift Container Platform" --version 3 --no-upstream-fetch; fi
18+
- if [ "$TRAVIS_BRANCH" == "enterprise-3.9" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.10" ] || [ "$TRAVIS_BRANCH" == "enterprise-3.11" ]; then python build.py --distro openshift-dedicated --product "OpenShift Container Platform" --version 3 --no-upstream-fetch; fi
19+
- python makeBuild.py
20+
21+
after_success:
22+
- bash autopreview.sh
23+
24+
after_failure:
25+
- bash autocomment.sh

404-commercial.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -134,7 +134,7 @@
134134
</a>
135135
<ul class="dropdown-menu">
136136
<li><a target="_blank" href="https://commons.openshift.org">OpenShift Commons</a></li>
137-
<li><a target="_blank" href="https://www.openshift.org">Open Source (Origin)</a></li>
137+
<li><a target="_blank" href="https://www.okd.io">Open Source (OKD)</a></li>
138138
<li><a target="_blank" href="https://www.openshift.com/community/programs/startups/">Startups</a></li>
139139
<li><a target="_blank" href="https://www.openshift.com/community/programs/grants/">Grants</a></li>
140140
</ul>

404-community.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<meta charset="utf-8">
1010
<meta content="IE=edge" http-equiv="X-UA-Compatible">
1111
<meta content="width=device-width, initial-scale=1.0" name="viewport">
12-
<title>404 | OpenShift Origin Documentation</title>
12+
<title>404 | OKD Documentation</title>
1313
<link href="https://assets.openshift.net/content/subdomain.css" rel="stylesheet" type="text/css">
1414
<link href="latest/_stylesheets/docs.css" rel="stylesheet" />
1515
<link href="latest/_stylesheets/search.css" rel="stylesheet" />

README.adoc

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
= OpenShift Documentation
22
Welcome to the OpenShift documentation GitHub repository that contains the source files for the technical documentation for the following products:
33

4-
* http://origin.openshift.com/[OpenShift Origin]
5-
* http://openshift.com/[OpenShift Online]
6-
* http://www.redhat.com/products/cloud-computing/openshift-enterprise/[OpenShift Enterprise]
7-
* https://www.openshift.com/dedicated/index.html[OpenShift Dedicated]
4+
* https://www.okd.io/[OKD]
5+
* https://www.openshift.com/products/online/[OpenShift Online]
6+
* https://www.openshift.com/products/container-platform/[OpenShift Container Platform]
7+
* https://www.openshift.com/products/dedicated/[OpenShift Dedicated]
88
99
All OpenShift documentation is sourced in http://www.methods.co.nz/asciidoc/[AsciiDoc] and transformed into HTML/CSS and other formats through automation that is based on http://asciidoctor.org/[AsciiDoctor].
1010

_templates/_page_openshift.html.erb

Lines changed: 31 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@
88
<meta charset="utf-8">
99
<meta content="IE=edge" http-equiv="X-UA-Compatible">
1010
<meta content="width=device-width, initial-scale=1.0" name="viewport">
11+
<!-- change this when 3.11 and 4.0 are released -->
12+
<%= (version == "3.11" || version == "4.0") ? '<meta name="robots" content="noindex,nofollow">' : '' %>
1113
<title><%= [topic_title, subgroup_title].compact.join(' - ') %> | <%= group_title %> | <%= distro %> <%= version %></title>
1214
<link href="https://assets.openshift.net/content/subdomain.css" rel="stylesheet" type="text/css">
1315
<link href="<%= File.join(css_path, 'docs.css') %>" rel="stylesheet" />
@@ -34,9 +36,10 @@
3436
<script src="<%= File.join(javascripts_path, "bootstrap-offcanvas.js") %>" type="text/javascript"></script>
3537
<script src="<%= File.join(javascripts_path, "reformat-html.js") %>" type="text/javascript"></script>
3638
<script src="<%= File.join(javascripts_path, "hc-search.js") %>" type="text/javascript"></script>
39+
<script src="<%= File.join(javascripts_path, "page-loader.js") %>" type="text/javascript"></script>
3740
<%= render("_templates/_analytics.html.erb", :distro_key => distro_key) %>
3841
</head>
39-
<body>
42+
<body onload="selectVersion('<%= version %>');">
4043
<%= render("_templates/_topnav.html.erb", :distro_key => distro_key) %>
4144
<div class="container">
4245
<p class="toggle-nav visible-xs pull-left">
@@ -47,7 +50,31 @@
4750
<a href="<%= site_home_path %>"><%= site_name %></a>
4851
</li>
4952
<li class="hidden-xs active">
50-
<%= breadcrumb_root %>
53+
<% if (distro_key == "openshift-enterprise") %>
54+
<% if (version = "3.10" || version >= "3.3") %>
55+
<a href="https://docs.openshift.com/container-platform/<%= version %>/welcome/index.html">
56+
<%= distro %>
57+
</a>
58+
<% else %>
59+
<a href="https://docs.openshift.com/enterprise/<%= version %>/welcome/index.html">
60+
<%= distro %>
61+
</a>
62+
<% end %>
63+
<select id="version-selector" onchange="versionSelector(this);">
64+
<option value="3.10">3.10</option>
65+
<option value="3.9">3.9</option>
66+
<option value="3.7">3.7</option>
67+
<option value="3.6">3.6</option>
68+
<option value="3.5">3.5</option>
69+
<option value="3.4">3.4</option>
70+
<option value="3.3">3.3</option>
71+
<option value="3.2">3.2</option>
72+
<option value="3.1">3.1</option>
73+
<option value="3.0">3.0</option>
74+
</select>
75+
<% else %>
76+
<%= breadcrumb_root %>
77+
<% end %>
5178
</li>
5279
<li class="hidden-xs active">
5380
<%= breadcrumb_group %>
@@ -58,7 +85,7 @@
5885
</li>
5986
<% if (distro_key != "openshift-origin") %>
6087
<span text-align="right" style="float: right !important">
61-
<a href="https://github.com/openshift/openshift-docs/commits/enterprise-<%= (distro_key == "openshift-enterprise") ? version : ((distro_key == "openshift-dedicated") ? "3.7" : "3.7") %>/<%= repo_path %>">
88+
<a href="https://github.com/openshift/openshift-docs/commits/enterprise-<%= (distro_key == "openshift-enterprise") ? version : ((distro_key == "openshift-dedicated") ? "3.9" : "3.9") %>/<%= repo_path %>">
6289
Page history
6390
</a>
6491
/
@@ -74,7 +101,7 @@
74101
<div class="row-fluid">
75102
<%= render("_templates/_search.html.erb", :distro_key => distro_key, :version => version) %>
76103
</div>
77-
<%= render("_templates/_nav_openshift.html.erb", :navigation => navigation, :group_id => group_id, :topic_id => topic_id, :subgroup_id => subgroup_id, :subtopic_shim => subtopic_shim) %>
104+
<%= render("_templates/_nav_openshift.html.erb", :distro_key => distro_key, :navigation => navigation, :group_id => group_id, :topic_id => topic_id, :subgroup_id => subgroup_id, :subtopic_shim => subtopic_shim) %>
78105
</div>
79106
<div class="col-xs-12 col-sm-9 col-md-9 main">
80107
<div class="page-header">

_templates/_topnav_other.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,7 @@
9292
</a>
9393
<ul class="dropdown-menu">
9494
<li><a target="_blank" href="https://commons.openshift.org">OpenShift Commons</a></li>
95-
<li><a target="_blank" href="https://www.openshift.org">Open Source (Origin)</a></li>
95+
<li><a target="_blank" href="https://www.okd.io">Open Source (OKD)</a></li>
9696
<li><a target="_blank" href="https://www.openshift.com/community/programs/startups/">Startups</a></li>
9797
<li><a target="_blank" href="https://www.openshift.com/community/programs/grants/">Grants</a></li>
9898
</ul>

_topic_map.yml

Lines changed: 10 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -20,12 +20,20 @@
2020
#
2121
# The ordering of the records in this document determines the ordering of the
2222
# topic groups and topics on the main page.
23+
---
24+
Name: Build and Deployments
25+
Dir: builds_and_deployments
26+
Distros: openshift-*
27+
Topics:
28+
- Name: Creating Build Inputs
29+
File: creating-build-inputs
30+
2331
---
2432
Name: OpenShift CCS Mod Docs Guide
2533
Dir: mod_docs_guide
2634
Distros: openshift-*
2735
Topics:
2836
- Name: Getting Started with Modular Docs on OpenShift
29-
File: assembly_getting-started-modular-docs-ocp
37+
File: getting-started-modular-docs-ocp
3038
- Name: OpenShift CCS Modular Docs Conventions
31-
File: assembly_mod-docs-conventions-ocp
39+
File: mod-docs-conventions-ocp
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Please delete this file once you have assemblies here.
2+

aura.tar.gz

122 KB
Binary file not shown.

authentication/PLACEHOLDER

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
Please delete this file once you have assemblies here.
2+

0 commit comments

Comments
 (0)