diff --git a/Makefile b/Makefile
index 6c55e9c..9d22dfa 100644
--- a/Makefile
+++ b/Makefile
@@ -17,6 +17,6 @@ Job Git URL: $(SPEC_URL)\n"
.PHONY: publish
publish:
oc process -f pipeline.yaml \
- --param=SPEC_REF=$(SPEC_REF) \
- --param=SPEC_URL=$(SPEC_URL) \
+ --param=SPEC_REF="abai-rhcos-4.4" \
+ --param=SPEC_URL="https://gitlab.cee.redhat.com/abai/rhcos-psi.git" \
| oc apply -f -
diff --git a/jobspec.yaml b/jobspec.yaml
index 8bf7286..25eeda7 100644
--- a/jobspec.yaml
+++ b/jobspec.yaml
@@ -5,7 +5,7 @@ archives:
compress:
enabled: true
brew:
- enabled: true
+ enabled: false
principle: rhcos-build/jenkins-redhat-coreos.cloud.paas.upshift.redhat.com@REDHAT.COM
profile: brew-stage
tag: rhaos-4.4-rhel-8-build
@@ -13,7 +13,7 @@ archives:
enabled: true
acl: private
bucket: rhcos-ci
- path: releases/4.4-devel
+ path: testing/abai-ootpa
artifacts:
all:
- ostree
@@ -22,7 +22,7 @@ artifacts:
- openstack
- vmware
- installer
- - aliyun
+ # - aliyun
- aws
- azure
- gcp
@@ -35,7 +35,7 @@ artifacts:
- openstack
- vmware
clouds:
- - aliyun
+ # - aliyun
- aws
- azure
- gcp
@@ -49,22 +49,22 @@ clouds_cfgs:
# us-east-1 has to be first, to match the s3 bucket. Try to keep
# everything else in sorted order.
- us-east-1
- - ap-northeast-1
- - ap-northeast-2
- - ap-south-1
- - ap-southeast-1
- - ap-southeast-2
- - ca-central-1
- - eu-central-1
- - eu-north-1
- - eu-west-1
- - eu-west-2
- - eu-west-3
- - me-south-1
- - sa-east-1
- - us-east-2
- - us-west-1
- - us-west-2
+ # - ap-northeast-1
+ # - ap-northeast-2
+ # - ap-south-1
+ # - ap-southeast-1
+ # - ap-southeast-2
+ # - ca-central-1
+ # - eu-central-1
+ # - eu-north-1
+ # - eu-west-1
+ # - eu-west-2
+ # - eu-west-3
+ # - me-south-1
+ # - sa-east-1
+ # - us-east-2
+ # - us-west-1
+ # - us-west-2
azure:
enabled: true
resource_group: os4-common
@@ -81,33 +81,33 @@ clouds_cfgs:
secret_payload: gce.json
# Alibaba Cloud (AliYun).
# Used by clouds/cloud-aliyun.groovy
- aliyun:
- enabled: true
- bucket: rhcos-images
- # This follows AWS semantics; first region is the primary one, others are
- # secondary and explicitly defined in production pipelines.
- regions:
- # Must match the region the rhcos-images bucket belongs to
- - us-west-1
- - ap-northeast-1
- - ap-south-1
- - ap-southeast-1
- - ap-southeast-2
- - ap-southeast-3
- - ap-southeast-5
- - cn-beijing
- - cn-chengdu
- - cn-hangzhou
- - cn-hongkong
- - cn-huhehaote
- - cn-qingdao
- - cn-shanghai
- - cn-shenzhen
- - cn-zhangjiakou
- - eu-central-1
- - eu-west-1
- - me-east-1
- - us-east-1
+ # aliyun:
+ # enabled: true
+ # bucket: rhcos-images
+ # # This follows AWS semantics; first region is the primary one, others are
+ # # secondary and explicitly defined in production pipelines.
+ # regions:
+ # # Must match the region the rhcos-images bucket belongs to
+ # - us-west-1
+ # - ap-northeast-1
+ # - ap-south-1
+ # - ap-southeast-1
+ # - ap-southeast-2
+ # - ap-southeast-3
+ # - ap-southeast-5
+ # - cn-beijing
+ # - cn-chengdu
+ # - cn-hangzhou
+ # - cn-hongkong
+ # - cn-huhehaote
+ # - cn-qingdao
+ # - cn-shanghai
+ # - cn-shenzhen
+ # - cn-zhangjiakou
+ # - eu-central-1
+ # - eu-west-1
+ # - me-east-1
+ # - us-east-1
cosa:
override: false
@@ -115,10 +115,11 @@ cosa:
job:
build_name: rhcos
dry_run: false
- is_production: true
+ # FIXME
+ is_production: false
pipeline_yaml: src/config/buildparams.yaml
skip_kola: false
- version_suffix: devel
+ version_suffix: abai
privileged_pod: true
service_account: jenkins-kvm
mount_refs:
@@ -132,8 +133,9 @@ mount_refs:
brew_configuration: brew-configuration
cluster_registry: rhcos-oopta-dockercfg-54fkw
recipe:
- git_ref: "master"
- git_url: https://gitlab.cee.redhat.com/coreos/redhat-coreos.git
+ # recipe points to the redhat-coreos (config) repo
+ git_ref: "test-switch-kernel"
+ git_url: https://gitlab.cee.redhat.com/abai/redhat-coreos.git
resources:
cosa_cpu: 2000m
cosa_cpu_max: 2000m
diff --git a/pipeline.yaml b/pipeline.yaml
index 1ca8ab7..07f3877 100644
--- a/pipeline.yaml
+++ b/pipeline.yaml
@@ -11,21 +11,21 @@ metadata:
iconClass: icon-jenkins
openshift.io/display-name: Red Hat CoreOS Pipeline
tags: rhcos,jenkins,rhcos-4.4
- name: rhcos-4.4
+ name: abai-rhcos-4.4
parameters:
- name: SPEC_REF
- value: "master"
+ value: "abai-rhcos-4.4"
description: Branch or Ref for this repo.
- name: SPEC_URL
- value: "https://gitlab.cee.redhat.com/coreos/redhat-coreos.git"
+ value: "https://gitlab.cee.redhat.com/abai/rhcos-psi.git"
description: URL for this repo.
objects:
- kind: BuildConfig
apiVersion: build.openshift.io/v1
metadata:
- name: "rhcos-4.4"
+ name: "abai-rhcos-4.4"
label:
app: rhcos
distro: ootpa
Last active
March 9, 2020 20:04
-
-
Save zonggen/4155107d3f3e54ea0b3cdcb1183e0dae to your computer and use it in GitHub Desktop.
Customized RHCOS Pipeline
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
First
oc login https://privileged.psi.redhat.com
with your own token and switch to the project by runningoc project rhcos
.Update and commit to both
redhat-coreos
andrhcos-psi
repo on gitlab.Run
make publish
or the equivalent alias under rhcos-psi repo, and the Jenkins will initialize the build config, note that currently the first build is setting up configs and the build will always fail.Then
oc get bc
oroc describe bc/abai-rhcos-4.4
to view the build, thenoc start-build abai-rhcos-4.4
to actually start the build.Now go to the web console and view the result -> https://jenkins-rhcos.cloud.privileged.psi.redhat.com/
redhat-coreos: https://gitlab.cee.redhat.com/coreos/redhat-coreos
rhcos-psi: https://gitlab.cee.redhat.com/coreos/rhcos-psi
Both repos need your own forks.