You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@flink.apache.org by mb...@apache.org on 2022/10/27 19:01:33 UTC

[flink] 34/34: [apple][release] Update rio.yaml for 1.15.2.4-acs

This is an automated email from the ASF dual-hosted git repository.

mbalassi pushed a commit to branch release-1.15.2.4-acs
in repository https://gitbox.apache.org/repos/asf/flink.git

commit 980776ab3e84668c1989315eb7caa246a76474d6
Author: Marton Balassi <ma...@apple.com>
AuthorDate: Thu Oct 27 21:00:16 2022 +0200

    [apple][release] Update rio.yaml for 1.15.2.4-acs
---
 pom.xml |   2 +-
 rio.yml | 119 +++++++++++++++++++++++++++++-----------------------------------
 2 files changed, 55 insertions(+), 66 deletions(-)

diff --git a/pom.xml b/pom.xml
index 68769809d81..486a2ffe463 100644
--- a/pom.xml
+++ b/pom.xml
@@ -185,7 +185,7 @@ under the License.
 			For Hadoop 2.7, the minor Hadoop version supported for flink-shaded-hadoop-2-uber is 2.7.5
 		-->
 		<hivemetastore.hadoop.version>2.7.5</hivemetastore.hadoop.version>
-		<japicmp.referenceVersion>1.15.2.1-acs</japicmp.referenceVersion>
+		<japicmp.referenceVersion>1.15.2.3-acs</japicmp.referenceVersion>
 		<japicmp.outputDir>tools/japicmp-output</japicmp.outputDir>
 		<spotless.version>2.13.0</spotless.version>
 		<spotless.scalafmt.version>3.4.3</spotless.scalafmt.version>
diff --git a/rio.yml b/rio.yml
index b16a1ea0d62..784a0c8af04 100644
--- a/rio.yml
+++ b/rio.yml
@@ -3,80 +3,69 @@ timeout: 120
 
 pipelines:
   # Pipeline to build Flink from Apple branch.
-  - name: publish-release-1.15-acs
-    branchName: release-1.15-acs
-    machine:
-      baseImage: docker.apple.com/thomas-weise/flink-ci:latest
-      env:
-        DOCKER_BUILDKIT: "1"
-    build:
-      template: freestyle:v4:publish
-      steps:
-        - cd /workspace
-        - rm -rf .staged-artifacts
-        - mvn clean deploy -Dscala-2.12 -Phive-3.1.3.0-apple,s3-plugin,docs-and-source -DskipTests -DaltDeploymentRepository=local-staging::default::file://`pwd`/.staged-artifacts
+- name: publish-release-1.15.2.4-acs
+  branchName: release-1.15.2.4-acs
+  machine:
+    baseImage: docker.apple.com/thomas-weise/flink-ci:latest
+    env:
+      DOCKER_BUILDKIT: '1'
+  build:
+    template: freestyle:v4:publish
+    steps:
+    - cd /workspace
+    - rm -rf .staged-artifacts
+    - mvn clean deploy -Dscala-2.12 -Phive-3.1.3.0-apple,s3-plugin,docs-and-source -DskipTests -DaltDeploymentRepository=local-staging::default::file://`pwd`/.staged-artifacts
         # see https://docs.aci.apple.com/rio/guide-to-rio/package-and-publish/freeform.html
         # must exclude maven-metadata.xml
-        - ci stage-lib --exclude maven-metadata.xml --exclude *.md5 --exclude *.sha1 --many-many-artifacts ./.staged-artifacts/**
+    - ci stage-lib --exclude maven-metadata.xml --exclude *.md5 --exclude *.sha1 --many-many-artifacts ./.staged-artifacts/**
         # Prepare for docker image build
-        - pushd flink-dist/target/flink-*-bin/; tar czf flink.tgz flink-*; cp flink.tgz /workspace/apple/docker/; popd
-        - pushd /workspace/apple/docker; wget https://artifacts.apple.com/artifactory/oss-patched-binaries-local/org/apache/hadoop/3.3.3.2-apple/hadoop-3.3.3.2-apple.tar.gz; popd
-    package:
+    - pushd flink-dist/target/flink-*-bin/; tar czf flink.tgz flink-*; cp flink.tgz /workspace/apple/docker/; popd
+    - pushd /workspace/apple/docker; wget https://artifacts.apple.com/artifactory/oss-patched-binaries-local/org/apache/hadoop/3.3.3.2-apple/hadoop-3.3.3.2-apple.tar.gz; popd
+  package:
       # enable for release (non -SNAPSHOT) builds
       # release: true
-      freeform:
-        - publish:
-            - repo: m2:oss-patched
-      dockerfile:
-        - dockerfilePath: apple/docker/Dockerfile
-          target: base
-          context: apple/docker/
-          perApplication: false
-          version: "1.15.2-acs-r${RIO_BUILD_NUMBER}"
-          extraTags: [ "1.15-acs-latest", "1.15.2-acs-latest" ]
-          publish:
-            - repo: docker.apple.com/acs-flink/flink
-        - dockerfilePath: apple/docker/Dockerfile
-          target: hadoop
-          context: apple/docker/
-          perApplication: false
-          version: "1.15.2-acs-r${RIO_BUILD_NUMBER}"
-          extraTags: [ "1.15-acs-latest", "1.15.2-acs-latest" ]
-          publish:
-            - repo: docker.apple.com/acs-flink/flink-hadoop
+    freeform:
+    - publish:
+      - repo: m2:oss-patched
+    dockerfile:
+    - dockerfilePath: apple/docker/Dockerfile
+      target: base
+      context: apple/docker/
+      perApplication: false
+      version: 1.15.2.4-acs
+      publish:
+      - repo: docker.apple.com/acs-flink/flink
+    - dockerfilePath: apple/docker/Dockerfile
+      target: hadoop
+      context: apple/docker/
+      perApplication: false
+      version: 1.15.2.4-acs
+      publish:
+      - repo: docker.apple.com/acs-flink/flink-hadoop
 
-  - name: binary-release-1.15-acs
-    branchName: release-1.15-acs
-    machine:
-      baseImage: docker.apple.com/thomas-weise/flink-ci:latest
-    build:
-      template: freestyle:v4:publish
-      steps:
-        - cd /workspace
-        - VERSION="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
-        - TIMESTAMP="$(date +"%Y%m%d.%H%M%S")"
-        - TIMED_VERSION=$(echo $VERSION | sed "s/SNAPSHOT/$TIMESTAMP/")
-        - mvn clean install -Dscala-2.12 -Phive-3.1.3.0-apple,s3-plugin,docs-and-source -DskipTests -Dfast
+    release: true
+- name: binary-release-1.15.2.4-acs
+  branchName: release-1.15.2.4-acs
+  machine:
+    baseImage: docker.apple.com/thomas-weise/flink-ci:latest
+  build:
+    template: freestyle:v4:publish
+    steps:
+    - cd /workspace
+    - VERSION="$(mvn help:evaluate -Dexpression=project.version -q -DforceStdout)"
+    - TIMESTAMP="$(date +"%Y%m%d.%H%M%S")"
+    - TIMED_VERSION=$(echo $VERSION | sed "s/SNAPSHOT/$TIMESTAMP/")
+    - mvn clean install -Dscala-2.12 -Phive-3.1.3.0-apple,s3-plugin,docs-and-source -DskipTests -Dfast
         # see https://docs.aci.apple.com/rio/guide-to-rio/package-and-publish/freeform.html
         # must exclude maven-metadata.xml
         # Prepare for docker image build
-        - pushd flink-dist/target/flink-*-bin/; tar czf flink-$TIMED_VERSION.tgz flink-*; cp flink-$TIMED_VERSION.tgz /workspace/; popd
-        - ci stage-lib "flink-$TIMED_VERSION.tgz,snapshot/org/apache/flink/flink-dist/$VERSION/"
-    package:
+    - pushd flink-dist/target/flink-*-bin/; tar czf flink-$TIMED_VERSION.tgz flink-*; cp flink-$TIMED_VERSION.tgz /workspace/; popd
+    - ci stage-lib "flink-$TIMED_VERSION.tgz,snapshot/org/apache/flink/flink-dist/$VERSION/"
+  package:
       # enable for release (non -SNAPSHOT) builds
       # release: true
-      freeform:
-        - publish:
-            - repo: oss-patched-binaries-local
+    freeform:
+    - publish:
+      - repo: oss-patched-binaries-local
 
-  - name: pull-request-release-1.15-acs
-    branchName: release-1.15-acs
-    timeout: 600
-    machine:
-      baseImage: docker.apple.com/thomas-weise/flink-ci:latest
-    build:
-      template: freestyle:v4:prb
-      steps:
-        - cd /workspace
-        - rm -rf .staged-artifacts
-        - mvn clean package -Phive-3.1.3.0-apple,s3-plugin -Dscala-2.12 -Dmaven.test.failure.ignore=true
+    release: true