Merge pull request openshift#18800 from vikram-redhat/fixtravis

fixing travis
jhou1 · Dec 28, 2019 · ac977e3 · ac977e3
2 parents e996f7b + 6468485
commit ac977e3
Show file tree

Hide file tree

Showing 3 changed files with 997 additions and 18 deletions.
diff --git a/.travis.yml b/.travis.yml
@@ -15,8 +15,7 @@ install:
  - pip install aura.tar.gz
 
 script:
- - python build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.3 --no-upstream-fetch
- - python makeBuild.py
+ - python build.py --distro openshift-enterprise --product "OpenShift Container Platform" --version 4.3 --no-upstream-fetch && python makeBuild.py
 
 after_success:
  - bash autopreview.sh

diff --git a/build.py b/build.py
@@ -578,36 +578,43 @@ def _fix_links(content, book_dir, src_file, info, tag=None, cwd=None):
         link_anchor = link.group(2)
         link_title = link.group(3)
 
-
         if link_file is not None:
             fixed_link_file = link_file.replace(".html", ".adoc")
             fixed_link_file_abs = os.path.abspath(os.path.join(current_dir, fixed_link_file))
             if fixed_link_file_abs in file_to_id_map:
+                if fixed_link_file_abs.startswith(book_dir + os.sep) or fixed_link_file_abs == src_file:
+                    # We are dealing with a cross reference within the same book here
+                    if link_anchor is None:
+                        # Cross reference to the top of a topic, without an id being specified
+                        link_anchor = "#" + file_to_id_map[fixed_link_file_abs]
 
-                # We are dealing with a cross reference to another book here
-                external_link = EXTERNAL_LINK_RE.search(link_file)
-                book_dir_name = external_link.group(1)
-
-                # Find the book name
-                book_name = book_dir_name
-                for book in info['data']:
-                    if check_node_distro_matches(book, info['distro']) and book['Dir'] == book_dir_name:
-                        book_name = book['Name']
-                        break
+                    fixed_link = "xref:" + link_anchor.replace("#", "") + link_title
+                else:
+                    # We are dealing with a cross reference to another book here
+                    external_link = EXTERNAL_LINK_RE.search(link_file)
+                    book_dir_name = external_link.group(1)
+
+                    # Find the book name
+                    book_name = book_dir_name
+                    for book in info['data']:
+                        if check_node_distro_matches(book, info['distro']) and book['Dir'] == book_dir_name:
+                            book_name = book['Name']
+                            break
 
-                fixed_link_file = BASE_PORTAL_URL + build_portal_url(info, book_name)
+                    fixed_link_file = BASE_PORTAL_URL + build_portal_url(info, book_name)
 
-                if link_anchor is None:
-                    fixed_link = "link:" + fixed_link_file + "#" + file_to_id_map[fixed_link_file_abs] + link_title
-                else:
-                    fixed_link = "link:" + fixed_link_file + link_anchor + link_title
+                    if link_anchor is None:
+                        fixed_link = "link:" + fixed_link_file + "#" + file_to_id_map[fixed_link_file_abs] + link_title
+                    else:
+                        fixed_link = "link:" + fixed_link_file + link_anchor + link_title
             else:
                 # Cross reference or link that isn't in the docs suite
                 fixed_link = link_text
                 if EXTERNAL_LINK_RE.search(link_file) is not None:
                     rel_src_file = src_file.replace(os.path.dirname(book_dir) + "/", "")
                     has_errors = True
                     log.error("ERROR (%s): \"%s\" appears to try to reference a file not included in the \"%s\" distro", rel_src_file, link_text.replace("\n", ""), info['distro'])
+                    sys.exit(-1)
         else:
             fixed_link = "xref:" + link_anchor.replace("#", "") + link_title