update stable route to stable/4.28.22

ooyala · Oct 24, 2018 · e33093d · e33093d
1 parent 83ae6e7
commit e33093d
Show file tree

Hide file tree

Showing 10 changed files with 103 additions and 34 deletions.
diff --git a/README.md b/README.md
@@ -17,12 +17,12 @@ This simple test HTML page can also be hosted on your environment to showcase ht
 <head>
   <meta charset="utf-8">
   <!-- V4 JS core and at least one video plugin is required. Plugins such as skin, discovery and Advertising need to be loaded separately -->
-  <script src="//player.ooyala.com/static/v4/production/latest/core.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/main_html5.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/bit_wrapper.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/core.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/main_html5.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/bit_wrapper.min.js"></script>
   <!-- Change these html5-skin.min.css and html5-skin.min.js to your local build if necessary -->
-  <script src="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.js"></script>
-  <link rel="stylesheet" href="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.css"/>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.js"></script>
+  <link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.css"/>
 </head>
 
 <body>
@@ -135,7 +135,7 @@ Simple customization can be achieved by modifying `skin.json` settings. Furtherm
 ```javascript
 var playerParam = {
   "skin": {
-    "config": "//player.ooyala.com/static/v4/production/latest/skin-plugin/skin.json",
+    "config": "//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/skin.json",
     "inline": {
       "startScreen": {"showDescription": false, "playIconStyle": {"color": "blue"}}
     }

diff --git a/amp_iframe.html b/amp_iframe.html
@@ -2,11 +2,11 @@
 <html style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
 <head>
   <meta charset="utf-8">
-  <script src="//player.ooyala.com/static/v4/production/latest/core.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/main_html5.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/bit_wrapper.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.js"></script>
-  <link rel="stylesheet" href="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.css"/>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/core.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/main_html5.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/bit_wrapper.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.js"></script>
+  <link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.css"/>
 </head>
 
 <body style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
@@ -68,7 +68,7 @@
       inline: {
         shareScreen: {
           embed: {
-            source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/production/latest/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
+            source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
           }
         }
       }

diff --git a/assets/icons-reference.html b/assets/icons-reference.html
@@ -6,7 +6,7 @@
     <meta name="viewport" content="width=device-width,initial-scale=1">
     <title>Font Reference - alice</title>
     <link href="http://fonts.googleapis.com/css?family=Dosis:400,500,700" rel="stylesheet" type="text/css">
-    <link rel="stylesheet" href="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.css">
+    <link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.css">
     <style type="text/css">html,body,div,span,applet,object,iframe,h1,h2,h3,h4,h5,h6,p,blockquote,pre,a,abbr,acronym,address,big,cite,code,del,dfn,em,img,ins,kbd,q,s,samp,small,strike,strong,sub,sup,tt,var,dl,dt,dd,ol,ul,li,fieldset,form,label,legend,table,caption,tbody,tfoot,thead,tr,th,td{margin:0;padding:0;border:0;outline:0;font-weight:inherit;font-style:inherit;font-family:inherit;font-size:100%;vertical-align:baseline}body{line-height:1;color:#000;background:#fff}ol,ul{list-style:none}table{border-collapse:separate;border-spacing:0;vertical-align:middle}caption,th,td{text-align:left;font-weight:normal;vertical-align:middle}a img{border:none}*{-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box}body{font-family:'Dosis','Tahoma',sans-serif}.container{margin:15px auto;width:80%}h1{margin:40px 0 20px;font-weight:700;font-size:38px;line-height:32px;color:#fb565e}h2{font-size:18px;padding:0 0 21px 5px;margin:45px 0 0 0;text-transform:uppercase;font-weight:500}.small{font-size:14px;color:#a5adb4;}.small a{color:#a5adb4;}.small a:hover{color:#fb565e}.glyphs.character-mapping{margin:0 0 20px 0;padding:20px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.character-mapping li{margin:0 30px 20px 0;display:inline-block;width:90px}.glyphs.character-mapping .icon{margin:10px 0 10px 15px;padding:15px;position:relative;width:55px;height:55px;color:#162a36 !important;overflow:hidden;-webkit-border-radius:3px;border-radius:3px;font-size:32px;}.glyphs.character-mapping .icon svg{fill:#000}.glyphs.character-mapping input{margin:0;padding:5px 0;line-height:12px;font-size:12px;display:block;width:100%;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;text-align:center;outline:0;}.glyphs.character-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.character-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping{margin:0 0 60px 0;padding:30px 0 20px 30px;color:rgba(0,0,0,0.5);border:1px solid #d8e0e5;-webkit-border-radius:3px;border-radius:3px;}.glyphs.css-mapping li{margin:0 30px 20px 0;padding:0;display:inline-block;overflow:hidden}.glyphs.css-mapping .icon{margin:0;margin-right:10px;padding:13px;height:50px;width:50px;color:#162a36 !important;overflow:hidden;float:left;font-size:24px}.glyphs.css-mapping input{margin:0;margin-top:5px;padding:8px;line-height:16px;font-size:16px;display:block;width:150px;height:40px;border:1px solid #d8e0e5;-webkit-border-radius:5px;border-radius:5px;background:#fff;outline:0;float:right;}.glyphs.css-mapping input:focus{border:1px solid #fbde4a;-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}.glyphs.css-mapping input:hover{-webkit-box-shadow:inset 0 0 3px #fbde4a;box-shadow:inset 0 0 3px #fbde4a}</style>
   </head>
   <body>

diff --git a/iframe.html b/iframe.html
@@ -2,12 +2,12 @@
 <html style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
 <head>
   <meta charset="utf-8">
-  <script src="//player.ooyala.com/static/v4/production/latest/core.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/main_html5.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/osmf_flash.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/bit_wrapper.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.js"></script>
-  <link rel="stylesheet" href="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.css"/>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/core.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/main_html5.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/osmf_flash.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/bit_wrapper.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.js"></script>
+  <link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.css"/>
 </head>
 
 <body style="padding:0; margin:0; width:100%; height:100%; overflow:hidden">
@@ -69,7 +69,7 @@
       inline: {
         shareScreen: {
           embed: {
-            source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/production/latest/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
+            source: "<iframe width='640' height='480' frameborder='0' allowfullscreen src='//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/iframe.html?ec=<ASSET_ID>&pbid=<PLAYER_ID>&pcode=<PUBLISHER_ID>'></iframe>"
           }
         }
       }

diff --git a/js/controller.js b/js/controller.js
@@ -24,7 +24,7 @@ OO.plugin('Html5Skin', function(OO, _, $, W) {
 
   if (OO.publicApi && OO.publicApi.VERSION) {
     // This variable gets filled in by the build script
-    OO.publicApi.VERSION.skin = { releaseVersion: '<SKIN_VERSION>', rev: '<SKIN_REV>' };
+    OO.publicApi.VERSION.skin = {"releaseVersion": "4.28.22", "rev": "<SKIN_REV>"};
   }
 
   var Html5Skin = function(mb, id) {

diff --git a/nvm.env b/nvm.env
@@ -0,0 +1,69 @@
+declare -x AWS_ACCESS_KEY_ID="AKIAIEOVHIBPLVRQPMXQ"
+declare -x AWS_SECRET_ACCESS_KEY="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"
+declare -x BUILD_CAUSE="MANUALTRIGGER"
+declare -x BUILD_CAUSE_MANUALTRIGGER="true"
+declare -x BUILD_DISPLAY_NAME="#135"
+declare -x BUILD_ID="135"
+declare -x BUILD_NUMBER="135"
+declare -x BUILD_TAG="jenkins-v4-deploy-mother-repo-stable-135"
+declare -x BUILD_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/135/"
+declare -x DERBY_HOME="/usr/lib/jvm/java-8-oracle/db"
+declare -x ENVIRONMENT="stable"
+declare -x EXECUTOR_NUMBER="0"
+declare -x GIT_AUTHOR_EMAIL="[email protected]"
+declare -x GIT_AUTHOR_NAME="QA Tools - Alfred Jenkins"
+declare -x GIT_BRANCH="origin/master"
+declare -x GIT_COMMIT="6b547cef4bf6bfcad9dcf905bb09fe3c66b3d77c"
+declare -x GIT_COMMITTER_EMAIL="[email protected]"
+declare -x GIT_COMMITTER_NAME="QA Tools - Alfred Jenkins"
+declare -x GIT_PREVIOUS_COMMIT="6b547cef4bf6bfcad9dcf905bb09fe3c66b3d77c"
+declare -x GIT_PREVIOUS_SUCCESSFUL_COMMIT="6b547cef4bf6bfcad9dcf905bb09fe3c66b3d77c"
+declare -x GIT_URL="ssh://[email protected]:7999/pbw/player-v4.git"
+declare -x HOME="/mnt/role-jenkins-service"
+declare -x HUDSON_COOKIE="31f7f065-dbfa-414d-be62-c620b84f40ab"
+declare -x HUDSON_HOME="/mnt2/jenkins"
+declare -x HUDSON_SERVER_COOKIE="6f8e664c79f90227"
+declare -x HUDSON_URL="http://jenkins-master1.services.ooyala.net:8080/"
+declare -x J2REDIR="/usr/lib/jvm/java-8-oracle/jre"
+declare -x J2SDKDIR="/usr/lib/jvm/java-8-oracle"
+declare -x JAVA_HOME="/usr/lib/jvm/java-8-oracle"
+declare -x JENKINS_HOME="/mnt2/jenkins"
+declare -x JENKINS_SERVER_COOKIE="6f8e664c79f90227"
+declare -x JENKINS_URL="http://jenkins-master1.services.ooyala.net:8080/"
+declare -x JOB_BASE_NAME="v4-deploy-mother-repo-stable"
+declare -x JOB_DISPLAY_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/display/redirect"
+declare -x JOB_NAME="v4-deploy-mother-repo-stable"
+declare -x JOB_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/"
+declare -x LANG="en_US.UTF-8"
+declare -x LOGNAME="role-jenkins-service"
+declare -x M2="/usr/share/maven3/bin"
+declare -x M2_HOME="/usr/share/maven3"
+declare -x MAIL="/var/mail/role-jenkins-service"
+declare -x NODE_LABELS="14.04 Ubuntu Ubuntu-14.04 alfred7 alfreds amd64 amd64-Ubuntu amd64-Ubuntu-14.04 golang1.2 openstack"
+declare -x NODE_NAME="alfred7"
+declare -x NVM_BIN="/mnt/role-jenkins-service/.nvm/versions/node/v8.11.3/bin"
+declare -x NVM_CD_FLAGS=""
+declare -x NVM_DIR="/mnt/role-jenkins-service/.nvm"
+declare -x OLDPWD="/data/role-jenkins-service/jenkins_slave_data_root/workspace/v4-deploy-mother-repo-stable"
+declare -x PATH="/mnt/role-jenkins-service/.nvm/versions/node/v8.11.3/bin:/opt/vagrant/bin:/mnt/role-jenkins-service/.rbenv/shims:/mnt/role-jenkins-service/.rbenv/bin:/mnt/role-jenkins-service/bin:/usr/share/maven3/bin:/opt/vagrant/bin:/mnt/role-jenkins-service/.rbenv/shims:/mnt/role-jenkins-service/.rbenv/bin:/mnt/role-jenkins-service/bin:/usr/share/maven3/bin:/opt/vagrant/bin:/opt/vagrant/bin:/mnt/role-jenkins-service/.rbenv/shims:/mnt/role-jenkins-service/.rbenv/bin:/mnt/role-jenkins-service/bin:/usr/share/maven3/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games:/usr/lib/jvm/java-8-oracle/bin:/usr/lib/jvm/java-8-oracle/db/bin:/usr/lib/jvm/java-8-oracle/jre/bin"
+declare -x PLAYER_V4_BRANCH="master"
+declare -x PWD="/data/role-jenkins-service/jenkins_slave_data_root/workspace/v4-deploy-mother-repo-stable/html5-skin"
+declare -x RBENV_SHELL="bash"
+declare -x ROOT_BUILD_CAUSE="MANUALTRIGGER"
+declare -x ROOT_BUILD_CAUSE_MANUALTRIGGER="true"
+declare -x RUN_CHANGES_DISPLAY_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/135/display/redirect?page=changes"
+declare -x RUN_DISPLAY_URL="http://jenkins-master1.services.ooyala.net:8080/job/v4-deploy-mother-repo-stable/135/display/redirect"
+declare -x SCALA_HOME="/usr/share/java"
+declare -x SHELL="/bin/bash"
+declare -x SHLVL="3"
+declare -x SPARK_HOME="/mnt/role-jenkins-service/build_data/spark-1.6.1-bin-without-hadoop/"
+declare -x SSH_CLIENT="10.203.1.179 39582 22"
+declare -x SSH_CONNECTION="10.203.1.179 39582 10.203.1.49 22"
+declare -x USER="role-jenkins-service"
+declare -x WORKSPACE="/data/role-jenkins-service/jenkins_slave_data_root/workspace/v4-deploy-mother-repo-stable"
+declare -x XDG_RUNTIME_DIR="/run/user/1001"
+declare -x XDG_SESSION_ID="7"
+declare -x aws_key_id="AKIAIEOVHIBPLVRQPMXQ"
+declare -x aws_secret_access_key="oh/lm54rRhem+yS5fP2KRCi3PfZAnBYCUKlMYf3Y"
+declare -x skin_node_version="8.11.3"
+declare -x version="4.28.22"
diff --git a/sample.html b/sample.html
@@ -2,11 +2,11 @@
 <html>
 <head>
   <meta charset="utf-8">
-  <script src="//player.ooyala.com/static/v4/production/latest/core.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/main_html5.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/video-plugin/bit_wrapper.min.js"></script>
-  <script src="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.js"></script>
-  <link rel="stylesheet" href="//player.ooyala.com/static/v4/production/latest/skin-plugin/html5-skin.min.css"/>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/core.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/main_html5.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/video-plugin/bit_wrapper.min.js"></script>
+  <script src="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.js"></script>
+  <link rel="stylesheet" href="//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/html5-skin.min.css"/>
 </head>
 
 <body>

diff --git a/scss/components/_share-panel.scss b/scss/components/_share-panel.scss
@@ -58,22 +58,22 @@
 
   .oo-facebook {
     @extend .oo-social-icon;
-    background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-facebook.svg");
+    background-image: url("//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/assets/images/social-facebook.svg");
   }
 
   .oo-twitter {
     @extend .oo-social-icon;
-    background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-twitter.svg");
+    background-image: url("//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/assets/images/social-twitter.svg");
   }
 
   .oo-google-plus {
     @extend .oo-social-icon;
-    background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-google.svg");
+    background-image: url("//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/assets/images/social-google.svg");
   }
 
   .oo-email-share {
     @extend .oo-social-icon;
-    background-image: url("//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/social-email.svg");
+    background-image: url("//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/assets/images/social-email.svg");
     background-size: cover;
   }
 

diff --git a/tests/components/controlBar-test.js b/tests/components/controlBar-test.js
@@ -1116,7 +1116,7 @@ describe('ControlBar', function() {
     baseMockProps.skinConfig.buttons.desktopContent = [
       {'name':'logo', 'location':'controlBar', 'whenDoesNotFit':'keep', 'minWidth':130 }
     ];
-    baseMockProps.skinConfig.controlBar.logo.imageResource.url = '//player.ooyala.com/static/v4/candidate/latest/skin-plugin/assets/images/ooyala-logo.svg';
+    baseMockProps.skinConfig.controlBar.logo.imageResource.url = '//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/assets/images/ooyala-logo.svg';
     baseMockProps.skinConfig.controlBar.logo.clickUrl = 'http://www.ooyala.com';
 
     var wrapper = Enzyme.mount(getControlBar(CONSTANTS.STATE.PLAYING, 100));

diff --git a/tests/components/utils-test.js b/tests/components/utils-test.js
@@ -500,19 +500,19 @@ describe('Utils', function() {
         availableLanguageFile: [
           {
             'language': 'en',
-            'languageFile': '//player.ooyala.com/static/v4/candidate/latest/skin-plugin/en.json',
+            'languageFile': '//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/en.json',
             'androidResource': 'skin-config/en.json',
             'iosResource': 'en'
           },
           {
             'language': 'es',
-            'languageFile': '//player.ooyala.com/static/v4/candidate/latest/skin-plugin/es.json',
+            'languageFile': '//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/es.json',
             'androidResource': 'skin-config/es.json',
             'iosResource': 'es'
           },
           {
             'language': 'zh',
-            'languageFile': '//player.ooyala.com/static/v4/candidate/latest/skin-plugin/zh.json',
+            'languageFile': '//player.ooyala.com/static/v4/stable/4.28.22/skin-plugin/zh.json',
             'androidResource': 'skin-config/zh.json',
             'iosResource': 'zh'
           }