Skip to content

Revert "MCD RPM and os container builds for 4.2+ branches" #6216

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
openshift-merge-robot merged 1 commit into from
Dec 3, 2019
Merged

Revert "MCD RPM and os container builds for 4.2+ branches" #6216

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
49 changes: 0 additions & 49 deletions ...or/config/openshift/machine-config-operator/openshift-machine-config-operator-master.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ base_images:
name: "4.4"
namespace: ocp
tag: base
base-machine:
name: fedora
namespace: openshift
tag: "29"
machine-os-content-base:
name: "4.3"
namespace: ocp
tag: machine-os-content
build_root:
image_stream_tag:
name: release
Expand All @@ -20,61 +12,20 @@ images:
- dockerfile_path: Dockerfile
from: base
to: machine-config-operator
- from: base
inputs:
base-machine-with-rpms:
as:
- fedora:29
paths: null
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
paths: null
to: machine-os-content
promotion:
additional_images:
machine-config-operator-rpms: rpms
excluded_images:
- machine-config-operator-base-with-rpms
- machine-os-content
name: "4.4"
namespace: ocp
raw_steps:
- rpm_image_injection_step:
from: base
to: machine-config-operator-base-with-rpms
- rpm_image_injection_step:
from: base-machine
to: base-machine-with-rpms
resources:
'*':
limits:
memory: 8Gi
requests:
cpu: 100m
memory: 200Mi
rpm_build_commands: |-
TMPDIR=$( mktemp -d )
RPMBUILD_DIR=_rpmbuild/
COMMIT=$( git rev-parse HEAD )
SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
rm -rf /srv/repo
mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
rm -rf /go/.cache ${RPMBUILD_DIR}
rpm_build_location: _rpmbuild/RPMS/
tag_specification:
name: "4.4"
namespace: ocp
tests:
- as: build-rpms-from-tar
commands: '# noop, just to force the building the `rpms` target'
container:
from: machine-config-operator-base-with-rpms
- as: unit
commands: make test-unit
container:
Expand Down
50 changes: 0 additions & 50 deletions ...nfig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.2.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ base_images:
name: "4.2"
namespace: ocp
tag: base
base-machine:
name: fedora
namespace: openshift
tag: "29"
machine-os-content-base:
name: "4.2"
namespace: ocp
tag: machine-os-content
build_root:
image_stream_tag:
name: release
Expand All @@ -20,62 +12,20 @@ images:
- dockerfile_path: Dockerfile
from: base
to: machine-config-operator
- context: ci/prow/images/
from: base
inputs:
base-machine-with-rpms:
as:
- fedora:29
paths: null
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
paths: null
to: machine-os-content
promotion:
additional_images:
machine-config-operator-rpms: rpms
excluded_images:
- machine-config-operator-base-with-rpms
- machine-os-content
name: "4.2"
namespace: ocp
raw_steps:
- rpm_image_injection_step:
from: base
to: machine-config-operator-base-with-rpms
- rpm_image_injection_step:
from: base-machine
to: base-machine-with-rpms
resources:
'*':
limits:
memory: 8Gi
requests:
cpu: 100m
memory: 200Mi
rpm_build_commands: |-
TMPDIR=$( mktemp -d )
RPMBUILD_DIR=_rpmbuild/
COMMIT=$( git rev-parse HEAD )
SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
rm -rf /srv/repo
mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
rm -rf /go/.cache ${RPMBUILD_DIR}
rpm_build_location: _rpmbuild/RPMS/
tag_specification:
name: "4.2"
namespace: ocp
tests:
- as: build-rpms-from-tar
commands: '# noop, just to force the building the `rpms` target'
container:
from: machine-config-operator-base-with-rpms
- as: unit
commands: make test-unit
container:
Expand Down
50 changes: 0 additions & 50 deletions ...nfig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.3.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ base_images:
name: "4.3"
namespace: ocp
tag: base
base-machine:
name: fedora
namespace: openshift
tag: "29"
machine-os-content-base:
name: "4.3"
namespace: origin
tag: machine-os-content
build_root:
image_stream_tag:
name: release
Expand All @@ -20,62 +12,20 @@ images:
- dockerfile_path: Dockerfile
from: base
to: machine-config-operator
- context: ci/prow/images/
from: base
inputs:
base-machine-with-rpms:
as:
- fedora:29
paths: null
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
paths: null
to: machine-os-content
promotion:
additional_images:
machine-config-operator-rpms: rpms
excluded_images:
- machine-config-operator-base-with-rpms
- machine-os-content
name: "4.3"
namespace: ocp
raw_steps:
- rpm_image_injection_step:
from: base
to: machine-config-operator-base-with-rpms
- rpm_image_injection_step:
from: base-machine
to: base-machine-with-rpms
resources:
'*':
limits:
memory: 8Gi
requests:
cpu: 100m
memory: 200Mi
rpm_build_commands: |-
TMPDIR=$( mktemp -d )
RPMBUILD_DIR=_rpmbuild/
COMMIT=$( git rev-parse HEAD )
SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
rm -rf /srv/repo
mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
rm -rf /go/.cache ${RPMBUILD_DIR}
rpm_build_location: _rpmbuild/RPMS/
tag_specification:
name: "4.3"
namespace: ocp
tests:
- as: build-rpms-from-tar
commands: '# noop, just to force the building the `rpms` target'
container:
from: machine-config-operator-base-with-rpms
- as: unit
commands: make test-unit
container:
Expand Down
49 changes: 0 additions & 49 deletions ...nfig/openshift/machine-config-operator/openshift-machine-config-operator-release-4.4.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,14 +3,6 @@ base_images:
name: "4.4"
namespace: ocp
tag: base
base-machine:
name: fedora
namespace: openshift
tag: "29"
machine-os-content-base:
name: "4.3"
namespace: ocp
tag: machine-os-content
build_root:
image_stream_tag:
name: release
Expand All @@ -20,62 +12,21 @@ images:
- dockerfile_path: Dockerfile
from: base
to: machine-config-operator
- from: base
inputs:
base-machine-with-rpms:
as:
- fedora:29
paths: null
machine-os-content-base:
as:
- registry.svc.ci.openshift.org/openshift/origin-v4.0:machine-os-content
paths: null
to: machine-os-content
promotion:
additional_images:
machine-config-operator-rpms: rpms
disabled: true
excluded_images:
- machine-config-operator-base-with-rpms
- machine-os-content
name: "4.4"
namespace: ocp
raw_steps:
- rpm_image_injection_step:
from: base
to: machine-config-operator-base-with-rpms
- rpm_image_injection_step:
from: base-machine
to: base-machine-with-rpms
resources:
'*':
limits:
memory: 8Gi
requests:
cpu: 100m
memory: 200Mi
rpm_build_commands: |-
TMPDIR=$( mktemp -d )
RPMBUILD_DIR=_rpmbuild/
COMMIT=$( git rev-parse HEAD )
SHORTCOMMIT=$( git rev-parse --short=7 HEAD )
mkdir -p ${RPMBUILD_DIR}/{BUILD,RPMS,SOURCES,SPECS,SRPMS}
tar -czf "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" --exclude='.git' --transform="s|^.|machine-config-operator-${COMMIT}|" --exclude="machine-config-operator-${COMMIT}.tar.gz" ./
cp ./machine-config-daemon.spec "${RPMBUILD_DIR}/SPECS/"
cp "${TMPDIR}/machine-config-operator-${COMMIT}.tar.gz" "${RPMBUILD_DIR}/SOURCES/machine-config-operator-${SHORTCOMMIT}.tar.gz"
rpmbuild -ba --nodeps --define "_topdir $( pwd )/${RPMBUILD_DIR}" --define "commit ${COMMIT}" ${RPMBUILD_DIR}/SPECS/machine-config-daemon.spec
rm -rf /srv/repo
mv ${RPMBUILD_DIR}/RPMS/x86_64 /srv/repo
rm -rf /go/.cache ${RPMBUILD_DIR}
rpm_build_location: _rpmbuild/RPMS/
tag_specification:
name: "4.4"
namespace: ocp
tests:
- as: build-rpms-from-tar
commands: '# noop, just to force the building the `rpms` target'
container:
from: machine-config-operator-base-with-rpms
- as: unit
commands: make test-unit
container:
Expand Down
1 change: 0 additions & 1 deletion ...enshift/machine-config-operator/openshift-machine-config-operator-master-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ postsubmits:
- --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=[images]
- --target=rpms
command:
- ci-operator
env:
Expand Down
49 changes: 0 additions & 49 deletions ...penshift/machine-config-operator/openshift-machine-config-operator-master-presubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,53 +1,5 @@
presubmits:
openshift/machine-config-operator:
- agent: kubernetes
always_run: true
branches:
- master
context: ci/prow/build-rpms-from-tar
decorate: true
decoration_config:
skip_cloning: true
labels:
ci-operator.openshift.io/prowgen-controlled: "true"
pj-rehearse.openshift.io/can-be-rehearsed: "true"
name: pull-ci-openshift-machine-config-operator-master-build-rpms-from-tar
rerun_command: /test build-rpms-from-tar
spec:
containers:
- args:
- --artifact-dir=$(ARTIFACTS)
- --branch=master
- --give-pr-author-access-to-namespace=true
- --org=openshift
- --repo=machine-config-operator
- --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=build-rpms-from-tar
command:
- ci-operator
env:
- name: CONFIG_SPEC
valueFrom:
configMapKeyRef:
key: openshift-machine-config-operator-master.yaml
name: ci-operator-master-configs
image: ci-operator:latest
imagePullPolicy: Always
name: ""
resources:
requests:
cpu: 10m
volumeMounts:
- mountPath: /etc/sentry-dsn
name: sentry-dsn
readOnly: true
serviceAccountName: ci-operator
volumes:
- name: sentry-dsn
secret:
secretName: sentry-dsn
trigger: (?m)^/test( | .* )build-rpms-from-tar,?($|\s.*)
- agent: kubernetes
always_run: false
branches:
Expand Down Expand Up @@ -550,7 +502,6 @@ presubmits:
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=[images]
- --target=[release:latest]
- --target=rpms
command:
- ci-operator
env:
Expand Down
1 change: 0 additions & 1 deletion ...ft/machine-config-operator/openshift-machine-config-operator-release-4.2-postsubmits.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,6 @@ postsubmits:
- --resolver-address=http://ci-operator-configresolver-ci.svc.ci.openshift.org
- --sentry-dsn-path=/etc/sentry-dsn/ci-operator
- --target=[images]
- --target=rpms
command:
- ci-operator
env:
Expand Down
Loading